diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm
index 775c18badc..157cc9cdb6 100644
--- a/code/game/master_controller.dm
+++ b/code/game/master_controller.dm
@@ -224,40 +224,4 @@ datum/controller/game_controller
 			process()
 
 
-		return 1
-
-
-
-/datum/failsafe // This thing pretty much just keeps poking the master controller
-	var/spinning = 1
-	var/current_iteration = 0
-
-/datum/failsafe/proc/spin()
-	if(!master_controller) // Well fuck.  How did this happen?
-		sleep(50)
-		if(!master_controller)
-			master_controller = new /datum/controller/game_controller()
-		spawn(-1)
-			master_controller.setup()
-
-	else
-		while(spinning)
-			current_iteration = controller_iteration
-			sleep(600) // Wait 15 seconds
-			if(current_iteration == controller_iteration) // Mm.  The master controller hasn't ticked yet.
-
-				for (var/mob/M in admin_list)
-					if (M.client)
-						M << "<font color='red' size='2'><b> Warning.  The Master Controller has not fired in the last 60 seconds.  Restart recommended.  Automatic restart in 60 seconds.</b></font>"
-
-				sleep(600)
-				if(current_iteration == controller_iteration)
-					for (var/mob/M in admin_list)
-						if (M.client)
-							M << "<font color='red' size='2'><b> Warning.  The Master Controller has not fired in the last 2 minutes.  Automatic restart beginning.</b></font>"
-					master_controller.process()
-					sleep(150)
-				else
-					for (var/mob/M in admin_list)
-						if (M.client)
-							M << "<font color='red' size='2'><b> The Master Controller has fired.  Automatic restart aborted.</b></font>"
\ No newline at end of file
+		return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm
index 952f9a7e66..8edbff3e3b 100644
--- a/code/modules/mob/living/carbon/metroid/life.dm
+++ b/code/modules/mob/living/carbon/metroid/life.dm
@@ -41,6 +41,8 @@
 	if(client)
 		handle_regular_hud_updates() */
 
+	if(stat == 2)
+		return
 	handle_nutrition()
 
 	if(Tempstun)