diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index c89421a55ba..a064788ebba 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -40,9 +40,6 @@
 						<A href='?src=\ref[src];secretsfun=quickpower'>Power all SMES</A><BR>
 						<BR>
 						<B>Shuttle options</b><br>
-						<A href='?src=\ref[src];secretsfun=toggleprisonstatus'>Toggle Prison Shuttle Status(Use with S/R)</A>&nbsp;&nbsp;
-						<A href='?src=\ref[src];secretsfun=activateprison'>Send Prison Shuttle</A>&nbsp;&nbsp;
-						<A href='?src=\ref[src];secretsfun=deactivateprison'>Return Prison Shuttle</A><BR>
 						<A href='?src=\ref[src];secretsfun=launchshuttle'>Launch a shuttle</A>&nbsp;&nbsp;
 						<A href='?src=\ref[src];secretsfun=forcelaunchshuttle'>Force launch a shuttle</A><BR>
 						<A href='?src=\ref[src];secretsfun=jumpshuttle'>Jump a shuttle</A>&nbsp;&nbsp;
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index c48041774bd..2e738dda4da 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -9,7 +9,7 @@
 	if(ticker.mode && ticker.mode.check_antagonists_topic(href, href_list))
 		check_antagonists()
 		return
-		
+
 	if(href_list["rejectadminhelp"])
 		if(!check_rights(R_MOD))
 			return
@@ -905,7 +905,7 @@
 							feedback_add_details("ban_job","- [job]")
 							jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]")
 							if(!msg)	msg = job
-							else		msg += ", [job]"						
+							else		msg += ", [job]"
 						add_note(M.ckey, "Banned  from [msg] - [reason]", null, usr, 0)
 						message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1)
 						M << "\red<BIG><B>You have been jobbanned by [usr.client.ckey] from: [msg].</B></BIG>"
@@ -1000,7 +1000,7 @@
 		if(query_noteedits.NextRow())
 			var/edit_log = query_noteedits.item[1]
 			usr << browse(edit_log,"window=noteedits")
-			
+
 	else if(href_list["removejobban"])
 		if(!check_rights(R_BAN))	return
 
@@ -1085,7 +1085,7 @@
 	else if(href_list["watchremove"])
 		var/target_ckey = href_list["watchremove"]
 		var/confirm = alert("Are you sure you want to remove [target_ckey] from the watchlist?", "Confirm Watchlist Removal", "Yes", "No")
-		if(confirm == "Yes")	
+		if(confirm == "Yes")
 			usr.client.watchlist_remove(target_ckey)
 
 	else if(href_list["watchedit"])
@@ -1119,8 +1119,8 @@
 			return
 		if(query_watchedits.NextRow())
 			var/edit_log = query_watchedits.item[1]
-			usr << browse(edit_log,"window=watchedits")		
-				
+			usr << browse(edit_log,"window=watchedits")
+
 	else if(href_list["mute"])
 		if(!check_rights(R_MOD))
 			return
@@ -1541,7 +1541,7 @@
 		if(!isobserver(usr))	C.admin_ghost()
 		sleep(2)
 		C.jumptomob(M)
-		
+
 	else if(href_list["adminplayerobservefollow"])
 		if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN))	return
 
@@ -2140,7 +2140,7 @@
 					message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]")
 					break
 		return
-		
+
 	else if(href_list["kick_all_from_lobby"])
 		if(!check_rights(R_ADMIN))
 			return
@@ -2256,34 +2256,6 @@
 				log_admin("[key_name(usr)] made all SMESs powered", 1)
 				message_admins("\blue [key_name_admin(usr)] made all SMESs powered", 1)
 				power_restore_quick()
-			if("activateprison")
-				feedback_inc("admin_secrets_fun_used",1)
-				feedback_add_details("admin_secrets_fun_used","AP")
-				world << "\blue <B>Transit signature detected.</B>"
-				world << "\blue <B>Incoming shuttle.</B>"
-				/*
-				var/A = locate(/area/shuttle_prison)
-				for(var/atom/movable/AM as mob|obj in A)
-					AM.z = 1
-					AM.Move()
-				*/
-				message_admins("\blue [key_name_admin(usr)] sent the prison shuttle to the station.", 1)
-			if("deactivateprison")
-				/*
-				feedback_inc("admin_secrets_fun_used",1)
-				feedback_add_details("admin_secrets_fun_used","DP")
-				var/A = locate(/area/shuttle_prison)
-				for(var/atom/movable/AM as mob|obj in A)
-					AM.z = 2
-					AM.Move()
-				*/
-				message_admins("\blue [key_name_admin(usr)] sent the prison shuttle back.", 1)
-			if("toggleprisonstatus")
-				feedback_inc("admin_secrets_fun_used",1)
-				feedback_add_details("admin_secrets_fun_used","TPS")
-				for(var/obj/machinery/computer/prison_shuttle/PS in world)
-					PS.allowedtocall = !(PS.allowedtocall)
-					message_admins("\blue [key_name_admin(usr)] toggled status of prison shuttle to [PS.allowedtocall].", 1)
 			if("prisonwarp")
 				if(!ticker)
 					alert("The game hasn't started yet!", null, null, null, null, null)