diff --git a/ceru/subcmds/new/cache-key b/ceru/subcmds/new/cache-key
index 9431a0b..0b5aa13 100755
--- a/ceru/subcmds/new/cache-key
+++ b/ceru/subcmds/new/cache-key
@@ -43,7 +43,6 @@ while [[ $# -gt 0 ]]; do
 			;;
 		-n|--name)
 			shift
-			# XXX: NOTE: do I need to safe shift (shift || true) since -e is set?
 			NAME="$1"; shift
 			;;
 		-P|--private-only)
@@ -52,7 +51,6 @@ while [[ $# -gt 0 ]]; do
 			;;
 		-o|--out)
 			shift
-			# XXX: NOTE: do I need to safe shift (shift || true) since -e is set?
 			SINK="$1"; shift
 			;;
 		-j|--json)
diff --git a/ceru/subcmds/new/ssh-key b/ceru/subcmds/new/ssh-key
index 82260aa..2bf700a 100755
--- a/ceru/subcmds/new/ssh-key
+++ b/ceru/subcmds/new/ssh-key
@@ -49,12 +49,10 @@ while [[ $# -gt 0 ]]; do
 			;;
 		-o|--out)
 			shift
-			# XXX: NOTE: do I need to safe shift (shift || true) since -e is set?
 			OUT="$1"; shift
 			;;
 		-c|--comment)
 			shift
-			# XXX: NOTE: do I need to safe shift (shift || true) since -e is set?
 			COMMENT="$1"; shift
 			;;
 		-t|--type)
@@ -63,7 +61,6 @@ while [[ $# -gt 0 ]]; do
 			;;
 		-r|--rounds)
 			shift
-			# XXX: NOTE: do I need to safe shift (shift || true) since -e is set?
 			ROUNDS="$1"; shift
 			;;
 		-N|--nopasswd)
diff --git a/ceru/subcmds/new/wg-key b/ceru/subcmds/new/wg-key
index 3a008a7..2efa85c 100755
--- a/ceru/subcmds/new/wg-key
+++ b/ceru/subcmds/new/wg-key
@@ -39,7 +39,6 @@ while [[ $# -gt 0 ]]; do
 			;;
 		-o|--out)
 			shift
-			# XXX: NOTE: do I need to safe shift (shift || true) since -e is set?
 			OUT="$1"; shift
 			;;
 		-j|--json)