diff --git a/src/f_finale.c b/src/f_finale.c
index 08ab3acfc..88260f068 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -2197,6 +2197,7 @@ void F_TitleScreenTicker(boolean run)
 		return;
 	}
 
+#ifdef STAFFGHOSTS
 	// is it time?
 	if (!(--demoIdleLeft))
 	{
@@ -2233,38 +2234,13 @@ void F_TitleScreenTicker(boolean run)
 			return;
 		}
 
-		// Replay intro when done cycling through demos
-		/*
-		if (curDemo == numDemos) -- uuuh... we have a LOT of maps AND a big devteam... probably not gonna see a repeat unless you're super unlucky :V
-		{
-			curDemo = 0;
-			F_StartIntro();
-			return;
-		}
-		*/
-
 		mapname = G_BuildMapName(G_RandMap(TOL_RACE, -2, 0, 0, false, NULL)+1);
 
 		numstaff = 1;
 		while (numstaff < 99 && (l = W_CheckNumForLongName(va("%sS%02u",mapname,numstaff+1))) != LUMPERROR)
 			numstaff++;
 
-#if 0 // turns out this isn't how we're gonna organise 'em
-		if (numstaff > 1)
-		{
-			if (laststaff && laststaff <= numstaff) // don't do the same staff member twice in a row, even if they're on different maps
-			{
-				numstaff = M_RandomKey(numstaff-1)+1;
-				if (numstaff >= laststaff)
-					numstaff++;
-			}
-			else
-				numstaff = M_RandomKey(numstaff)+1;
-		}
-		laststaff = numstaff;
-#else
 		numstaff = M_RandomKey(numstaff)+1;
-#endif
 
 		// Setup demo name
 		dname2 = Z_StrDup(va("%sS%02u", mapname, numstaff));
@@ -2287,6 +2263,7 @@ loadreplay:
 			Z_Free(dname2);
 		}
 	}
+#endif //#ifdef STAFFGHOSTS
 }
 
 void F_TitleDemoTicker(void)
diff --git a/src/g_game.c b/src/g_game.c
index 6547b84f5..1defa4369 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3512,6 +3512,7 @@ tryagain:
 				continue;
 		}
 
+#ifdef STAFFGHOSTS
 		if (pprevmap == -2) // title demo hack
 		{
 			lumpnum_t l;
@@ -3519,6 +3520,7 @@ tryagain:
 			if ((l = W_CheckNumForLongName(va("%sS01",G_BuildMapName(ix+1)))) == LUMPERROR)
 				continue;
 		}
+#endif //#ifdef STAFFGHOSTS
 
 		okmaps[numokmaps++] = ix;
 	}
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 0fad3451a..a1b8505cc 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -245,7 +245,7 @@ static void Dummymenuplayer_OnChange(void)
 
 static void Dummystaff_OnChange(void)
 {
-#if 0
+#ifdef STAFFGHOSTS
 	lumpnum_t l;
 
 	dummystaffname[0] = '\0';
@@ -277,7 +277,7 @@ static void Dummystaff_OnChange(void)
 
 		sprintf(temp, " - %d", cv_dummystaff.value);
 	}
-#endif
+#endif //#ifdef STAFFGHOSTS
 }
 
 void Screenshot_option_Onchange(void)
diff --git a/src/p_setup.c b/src/p_setup.c
index 5a7b86c90..9d60e49d8 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3760,6 +3760,7 @@ static void P_LoadRecordGhosts(void)
 	if (cv_ghost_guest.value && FIL_FileExists(va("%s-guest.lmp", gpath)))
 		G_AddGhost(va("%s-guest.lmp", gpath));
 
+#ifdef STAFFGHOSTS
 	// Staff Attack ghosts
 	if (cv_ghost_staff.value)
 	{
@@ -3772,6 +3773,7 @@ static void P_LoadRecordGhosts(void)
 			j++;
 		}
 	}
+#endif //#ifdef STAFFGHOSTS
 
 	free(gpath);
 }