diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index b6b1094b103..f0a8f8957b2 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -78,7 +78,7 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
 	check_completion()
 		if(target && target.current)
 			// TODO: Tie into space manager
-			if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > ZLEVEL_DERELICT || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
+			if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
 				return 1
 			return 0
 		return 1
@@ -174,10 +174,11 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
 	check_completion()
 		if(target && target.current)
 			// TODO: Tie into space manager
-			if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > ZLEVEL_DERELICT || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
+			if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
 				return 1
 			// TODO: Tie into space manager
-			if((target.current.z in config.admin_levels))
+			var/turf/target_location = get_turf(target.current)
+			if(target_location.z in config.admin_levels) //No hiding in lockers and cheezing greentext.
 				return 0
 		return 1
 
@@ -342,16 +343,6 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
 
 /datum/objective/escape
 	explanation_text = "Escape on the shuttle or an escape pod alive and free."
-	var/escape_areas = list(/area/shuttle/escape,
-		/area/shuttle/escape_pod1/centcom,
-		/area/shuttle/escape_pod1/transit,
-		/area/shuttle/escape_pod2/centcom,
-		/area/shuttle/escape_pod2/transit,
-		/area/shuttle/escape_pod3/centcom,
-		/area/shuttle/escape_pod3/transit,
-		/area/shuttle/escape_pod5/centcom,
-		/area/shuttle/escape_pod5/transit,
-		/area/centcom/evac)
 
 	check_completion()
 		if(issilicon(owner.current))