diff --git a/wayneko.1 b/wayneko.1
index dce4503..eb2016a 100644
--- a/wayneko.1
+++ b/wayneko.1
@@ -17,9 +17,8 @@ wayneko \- Neko on Wayland but with phases
 .OP \-\-outline\-colour 0xRRGGBB[AA]
 .OP \-\-type neko|inu|random
 .OP \-\-idle-sleep seconds
-.OP \-\-sleep-phase seconds-seconds
-.OP \-\-awake-phase seconds-seconds
-.OP \-\-currently awake|asleep|random
+.OP \-\-phase-sleep seconds-seconds
+.OP \-\-phase-awake seconds-seconds
 .OP \-\-layer background|bottom|top|overlay
 .OP \-\-survive\-close
 .YS
@@ -70,7 +69,7 @@ idle.
 .RE
 .
 .P
-\fB\-\-awake-phase\fR \fIseconds-seconds\fR
+\fB\-\-phase-awake\fR \fIseconds-seconds\fR
 .RS
 Set the duration of how long neko will be awake at a time. Takes a minimum
 and a maximum amount of seconds, separated by a dash. Actual duration will
@@ -78,7 +77,7 @@ be drawn uniformly at random between the two values. Defaults to 120-600.
 .RE
 .
 .P
-\fB\-\-sleep-phase\fR \fIseconds-seconds\fR
+\fB\-\-phase-sleep\fR \fIseconds-seconds\fR
 .RS
 Set the duration of how long neko will sleep at a time. Takes a minimum
 and a maximum amount of seconds, separated by a dash. Actual duration will
@@ -86,12 +85,6 @@ be drawn uniformly at random between the two values. Defaults to 450-1800.
 .RE
 .
 .P
-\fB\-\-currently\fR \fBawake\fR|\fBasleep\fR|\fBrandom\fR
-.RS
-Set whether neko is currenly (at startup) awake or asleep.
-.RE
-.
-.P
 \fB\-\-layer\fR \fBbackground\fR|\fBbottom\fR|\fBtop\fR|\fBoverlay\fR
 .RS
 Set the layer for the surface.
diff --git a/wayneko.c b/wayneko.c
index b83fe09..cb6199b 100644
--- a/wayneko.c
+++ b/wayneko.c
@@ -32,10 +32,9 @@ const char usage[] =
 	"  --background-colour 0xRRGGBB[AA]\n"
 	"  --outline-colour    0xRRGGBB[AA]\n"
 	"  --type              neko|inu|random\n"
-    "  --idle-sleep        seconds\n"
-    "  --sleep-phase       seconds-seconds\n"
-    "  --awake-phase       seconds-seconds\n"
-    "  --currently         awake|asleep|random\n"
+    "  --idle-sleep        num\n"
+    "  --phase-sleep       num-num\n"
+    "  --phase-awake       num-num\n"
 	"  --layer             background|bottom|top|overlay\n"
 	"  --survive-close\n"
 	"\n";
@@ -1441,7 +1440,6 @@ int main (int argc, char *argv[])
 		{
 			char* a = get_argument(argc, argv, &i);
 			char* b = a;
-			if (a == NULL) return EXIT_FAILURE;
 
 			while (*b != '-' && *b != 0) b++;
 			if (*b == 0) {
@@ -1465,7 +1463,6 @@ int main (int argc, char *argv[])
 		{
 		    char* a = get_argument(argc, argv, &i);
 			char* b = a;
-			if (a == NULL) return EXIT_FAILURE;
 
 			while (*b != '-' && *b != 0) b++;
 			if (*b == 0) {
@@ -1485,28 +1482,6 @@ int main (int argc, char *argv[])
 				return EXIT_FAILURE;
 			}
 		}
-		else if ( strcmp(argv[i], "--currently") == 0 )
-		{
-			const char *t = get_argument(argc, argv, &i);
-			if ( t == NULL )
-				return EXIT_FAILURE;
-
-			/* yes, the phases are swapped because the first thing that will happen is a phase change */
-			if ( strcmp(t, "awake") == 0 )
-				current_phase = PHASE_SLEEP;
-			else if ( strcmp(t, "asleep") == 0 )
-			    current_phase = PHASE_AWAKE;
-			else if ( strcmp(t, "random") == 0 )
-				current_phase = rand() % 2 == 0 ? PHASE_SLEEP : PHASE_AWAKE;
-			else
-			{
-				fprintf(stderr, "ERROR: Unknown argument '%s' for flag '--currently'.\n", t);
-				return EXIT_FAILURE;
-			}
-
-			if (current_phase == PHASE_AWAKE)
-			    current_neko = NEKO_SLEEP_1;
-		}
 		else
 		{
 			fprintf(stderr, "ERROR: Unknown option: %s\n", argv[i]);