diff --git a/src/p_map.c b/src/p_map.c
index 8d0a7aeb1..62f64922c 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -52,7 +52,7 @@ fixed_t tmfloorz, tmceilingz;
 static fixed_t tmdropoffz, tmdrpoffceilz; // drop-off floor/ceiling heights
 mobj_t *tmfloorthing; // the thing corresponding to tmfloorz or NULL if tmfloorz is from a sector
 mobj_t *tmhitthing; // the solid thing you bumped into (for collisions)
-ffloor_t *tmfloorrover, *tmceilingrover;
+//ffloor_t *tmfloorrover, *tmceilingrover; // unused for now
 size_t tmfloor_sectornum, tmfloor_rovernum, tmceiling_sectornum, tmceiling_rovernum;
 #ifdef ESLOPE
 pslope_t *tmfloorslope, *tmceilingslope;
@@ -1419,7 +1419,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 				if (thing->z + thing->height > tmfloorz)
 				{
 					tmfloorz = thing->z + thing->height;
-					tmfloorrover = NULL;
+					// tmfloorrover = NULL;
 					tmfloor_sectornum = tmfloor_rovernum = 0;
 #ifdef ESLOPE
 					tmfloorslope = NULL;
@@ -1441,7 +1441,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 					return false;
 
 				tmfloorz = tmceilingz = topz; // block while in air
-				tmceilingrover = NULL;
+				// tmceilingrover = NULL;
 				tmceiling_sectornum = tmceiling_rovernum = 0;
 #ifdef ESLOPE
 				tmceilingslope = NULL;
@@ -1451,7 +1451,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 			else if (topz < tmceilingz && tmthing->z <= thing->z+thing->height)
 			{
 				tmceilingz = topz;
-				tmceilingrover = NULL;
+				// tmceilingrover = NULL;
 				tmceiling_sectornum = tmceiling_rovernum = 0;
 #ifdef ESLOPE
 				tmceilingslope = NULL;
@@ -1469,7 +1469,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 				if (thing->z < tmceilingz)
 				{
 					tmceilingz = thing->z;
-					tmceilingrover = NULL;
+					// tmceilingrover = NULL;
 					tmceiling_sectornum = tmceiling_rovernum = 0;
 #ifdef ESLOPE
 					tmceilingslope = NULL;
@@ -1491,7 +1491,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 					return false;
 
 				tmfloorz = tmceilingz = topz; // block while in air
-				tmfloorrover = NULL;
+				// tmfloorrover = NULL;
 				tmfloor_sectornum = tmfloor_rovernum = 0;
 #ifdef ESLOPE
 				tmfloorslope = NULL;
@@ -1501,7 +1501,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 			else if (topz > tmfloorz && tmthing->z+tmthing->height >= thing->z)
 			{
 				tmfloorz = topz;
-				tmfloorrover = NULL;
+				// tmfloorrover = NULL;
 				tmfloor_sectornum = tmfloor_rovernum = 0;
 #ifdef ESLOPE
 				tmfloorslope = NULL;
@@ -1654,7 +1654,7 @@ static boolean PIT_CheckLine(line_t *ld)
 	{
 		tmceilingz = opentop;
 		ceilingline = ld;
-		tmceilingrover = NULL;
+		// tmceilingrover = NULL;
 		tmceiling_sectornum = tmceiling_rovernum = 0;
 #ifdef ESLOPE
 		tmceilingslope = opentopslope;
@@ -1664,7 +1664,7 @@ static boolean PIT_CheckLine(line_t *ld)
 	if (openbottom > tmfloorz)
 	{
 		tmfloorz = openbottom;
-		tmfloorrover = NULL;
+		// tmfloorrover = NULL;
 		tmfloor_sectornum = tmfloor_rovernum = 0;
 #ifdef ESLOPE
 		tmfloorslope = openbottomslope;
@@ -1747,9 +1747,9 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 	// will adjust them.
 	tmfloorz = tmdropoffz = P_GetFloorZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->floorheight;
 	tmceilingz = P_GetCeilingZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->ceilingheight;
-	tmfloorrover = NULL;
+	// tmfloorrover = NULL;
 	tmfloor_sectornum = tmfloor_rovernum = 0;
-	tmceilingrover = NULL;
+	// tmceilingrover = NULL;
 	tmceiling_sectornum = tmceiling_rovernum = 0;
 #ifdef ESLOPE
 	tmfloorslope = newsubsec->sector->f_slope;
@@ -1798,7 +1798,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 					{
 						if (tmfloorz < topheight - sinklevel) {
 							tmfloorz = topheight - sinklevel;
-							tmfloorrover = rover;
+							// tmfloorrover = rover;
 							tmfloor_sectornum = newsubsec->sector - sectors;
 							tmfloor_rovernum = rovernum;
 #ifdef ESLOPE
@@ -1810,7 +1810,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 					{
 						if (tmceilingz > bottomheight + sinklevel) {
 							tmceilingz = bottomheight + sinklevel;
-							tmceilingrover = rover;
+							// tmceilingrover = rover;
 							tmceiling_sectornum = newsubsec->sector - sectors;
 							tmceiling_rovernum = rovernum;
 #ifdef ESLOPE
@@ -1841,7 +1841,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 				{
 					if (tmfloorz < thing->z) {
 						tmfloorz = thing->z;
-						tmfloorrover = rover;
+						// tmfloorrover = rover;
 						tmfloor_sectornum = newsubsec->sector - sectors;
 						tmfloor_rovernum = rovernum;
 #ifdef ESLOPE
@@ -1863,7 +1863,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 				&& !(rover->flags & FF_REVERSEPLATFORM))
 			{
 				tmfloorz = tmdropoffz = topheight;
-				tmfloorrover = rover;
+				// tmfloorrover = rover;
 				tmfloor_sectornum = newsubsec->sector - sectors;
 				tmfloor_rovernum = rovernum;
 #ifdef ESLOPE
@@ -1875,7 +1875,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 				&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
 			{
 				tmceilingz = tmdrpoffceilz = bottomheight;
-				tmceilingrover = rover;
+				// tmceilingrover = rover;
 				tmceiling_sectornum = newsubsec->sector - sectors;
 				tmceiling_rovernum = rovernum;
 #ifdef ESLOPE
@@ -2375,8 +2375,8 @@ boolean PIT_PushableMoved(mobj_t *thing)
 		mobj_t *oldthing = tmthing;
 		line_t *oldceilline = ceilingline;
 		line_t *oldblockline = blockingline;
-		ffloor_t *oldflrrover = tmfloorrover;
-		ffloor_t *oldceilrover = tmceilingrover;
+		// ffloor_t *oldflrrover = tmfloorrover;
+		// ffloor_t *oldceilrover = tmceilingrover;
 		size_t oldflrrover_sectornum = tmfloor_sectornum;
 		size_t oldflrrover_ffloornum = tmfloor_rovernum;
 		size_t oldceilrover_sectornum = tmceiling_sectornum;
@@ -2397,8 +2397,8 @@ boolean PIT_PushableMoved(mobj_t *thing)
 		P_SetTarget(&tmthing, oldthing);
 		ceilingline = oldceilline;
 		blockingline = oldblockline;
-		tmfloorrover = oldflrrover;
-		tmceilingrover = oldceilrover;
+		// tmfloorrover = oldflrrover;
+		// tmceilingrover = oldceilrover;
 		tmfloor_sectornum = oldflrrover_sectornum;
 		tmfloor_rovernum = oldflrrover_ffloornum;
 		tmceiling_sectornum = oldceilrover_sectornum;