diff --git a/src/d_player.h b/src/d_player.h
index 388b578a0..cdc4fed30 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -240,10 +240,6 @@ typedef enum
 	k_position,			// Used for Kart positions, mostly for deterministic stuff
 	k_oldposition,		// Used for taunting when you pass someone
 	k_positiondelay,	// Used for position number, so it can grow when passing/being passed
-	k_prevcheck,		// Previous checkpoint distance; for p_user.c (was "pw_pcd")
-	k_nextcheck,		// Next checkpoint distance; for p_user.c (was "pw_ncd")
-	k_waypoint,			// Waypoints.
-	k_starpostwp,		// Temporarily stores player waypoint for... some reason. Used when respawning and finishing.
 	k_starpostflip,		// the last starpost we hit requires flipping?
 	k_respawn,			// Timer for the DEZ laser respawn effect
 	k_dropdash,			// Charge up for respawn Drop Dash
diff --git a/src/g_game.c b/src/g_game.c
index 72bbe6f69..297f4a198 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2571,7 +2571,6 @@ void G_PlayerReborn(INT32 player)
 	SINT8 pity;
 
 	// SRB2kart
-	INT32 starpostwp;
 	INT32 itemtype;
 	INT32 itemamount;
 	INT32 itemroulette;
@@ -2635,12 +2634,9 @@ void G_PlayerReborn(INT32 player)
 		rings = (G_BattleGametype() ? 0 : 5);
 		comebackpoints = 0;
 		wanted = 0;
-		starpostwp = 0;
 	}
 	else
 	{
-		starpostwp = players[player].kartstuff[k_starpostwp];
-
 		itemroulette = (players[player].kartstuff[k_itemroulette] > 0 ? 1 : 0);
 		roulettetype = players[player].kartstuff[k_roulettetype];
 
@@ -2707,7 +2703,6 @@ void G_PlayerReborn(INT32 player)
 	p->pity = pity;
 
 	// SRB2kart
-	p->kartstuff[k_starpostwp] = starpostwp; // TODO: get these out of kartstuff, it causes desync (Does it...?)
 	p->kartstuff[k_itemroulette] = itemroulette;
 	p->kartstuff[k_roulettetype] = roulettetype;
 	p->kartstuff[k_itemtype] = itemtype;
diff --git a/src/k_kart.c b/src/k_kart.c
index 024431478..f0bc7149b 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -9788,11 +9788,10 @@ static void K_drawCheckpointDebugger(void)
 	if (stplyr != &players[displayplayers[0]]) // only for p1
 		return;
 
-	if (stplyr->starpostnum >= (numstarposts - (numstarposts/2)))
+	if (stplyr->starpostnum == numstarposts)
 		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts));
 	else
-		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum)));
-	V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck]));
+		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d", stplyr->starpostnum, numstarposts));
 }
 
 static void K_DrawWaypointDebugger(void)
diff --git a/src/p_inter.c b/src/p_inter.c
index de14b3db9..4ea169a83 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1461,12 +1461,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 		case MT_STARPOST:
 			if (player->bot)
 				return;
-			// SRB2kart - 150117
-			if (player->exiting) //STOP MESSING UP MY STATS FASDFASDF
-			{
-				player->kartstuff[k_starpostwp] = player->kartstuff[k_waypoint];
-				return;
-			}
 			//
 			// SRB2kart: make sure the player will have enough checkpoints to touch
 			if (circuitmap && special->health >= ((numstarposts/2) + player->starpostnum))
@@ -3306,12 +3300,12 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
 
 	// 20 is the ring cap in kart
 	if (num_rings > 20)
-		num_rings = 20; 
+		num_rings = 20;
 	else if (num_rings <= 0)
 		return;
 
 	// Cap the maximum loss automatically to 2 in ring debt
-	if (player->kartstuff[k_rings] <= 0 && num_rings > 2) 
+	if (player->kartstuff[k_rings] <= 0 && num_rings > 2)
 		num_rings = 2;
 
 	P_GivePlayerRings(player, -num_rings);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index ffac8e678..d211bbc11 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11205,8 +11205,6 @@ void P_MovePlayerToStarpost(INT32 playernum)
 
 	mobj->angle = p->starpostangle;
 
-	p->kartstuff[k_waypoint] = p->kartstuff[k_starpostwp]; // SRB2kart
-
 	P_AfterPlayerSpawn(playernum);
 
 	//if (!(netgame || multiplayer))
diff --git a/src/p_spec.c b/src/p_spec.c
index de7f37f0d..209aa1a18 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -4225,8 +4225,6 @@ DoneSection2:
 
 		case 10: // Finish Line
 			// SRB2kart - 150117
-			if (G_RaceGametype() && ((player->starpostnum == numstarposts) || player->exiting))
-				player->kartstuff[k_starpostwp] = player->kartstuff[k_waypoint] = 0;
 			//
 			if (G_RaceGametype() && !player->exiting)
 			{