diff --git a/src/g_game.c b/src/g_game.c
index 47e144c42..5ce2dc0a4 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3298,26 +3298,6 @@ INT16 G_SometimesGetDifferentGametype(void)
 	return (gametype|encoremodifier);
 }
 
-//
-// G_GetGametypeColor
-//
-// Pretty and consistent ^u^
-// See also M_GetGametypeColor (if that still exists).
-//
-UINT8 G_GetGametypeColor(INT16 gt)
-{
-	if (modeattacking) // == ATTACKING_RECORD
-		return orangemap[0];
-
-	if (gt == GT_BATTLE)
-		return redmap[0];
-
-	if (gt == GT_RACE)
-		return skymap[0];
-
-	return 255; // FALLBACK
-}
-
 /** Get the typeoflevel flag needed to indicate support of a gametype.
   * \param gametype The gametype for which support is desired.
   * \return The typeoflevel flag to check for that gametype.
diff --git a/src/g_game.h b/src/g_game.h
index 227274590..eebb956e9 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -190,7 +190,6 @@ boolean G_GametypeHasTeams(void);
 boolean G_GametypeHasSpectators(void);
 #define VOTEMODIFIER_ENCORE 0x80
 INT16 G_SometimesGetDifferentGametype(void);
-UINT8 G_GetGametypeColor(INT16 gt);
 void G_ExitLevel(void);
 void G_NextLevel(void);
 void G_Continue(void);
diff --git a/src/y_inter.c b/src/y_inter.c
index 1d4393dc3..9d7a62f3e 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1209,12 +1209,8 @@ void Y_VoteDrawer(void)
 
 	if (timer)
 	{
-		INT32 hilicol, tickdown = (timer+1)/TICRATE;
-		if (gametype == GT_RACE)
-			hilicol = V_SKYMAP;
-		else //if (gametype == GT_BATTLE)
-			hilicol = V_REDMAP;
-		V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol,
+		INT32 tickdown = (timer+1)/TICRATE;
+		V_DrawCenteredString(BASEVIDWIDTH/2, 188, V_YELLOWMAP,
 			va("Vote ends in %d", tickdown));
 	}
 }
@@ -1554,7 +1550,7 @@ void Y_StartVote(void)
 		levelinfo[i].str[sizeof levelinfo[i].str - 1] = '\0';
 
 		// set up the gtc and gts
-		levelinfo[i].gtc = G_GetGametypeColor(votelevels[i][1]);
+		levelinfo[i].gtc = 255; // TODO rewrite vote screen
 		if (i == 2 && votelevels[i][1] != votelevels[0][1])
 			levelinfo[i].gts = gametypes[votelevels[i][1]]->name;
 		else