diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 7b8854eb22a..8df6edcb713 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -44,12 +44,6 @@
 /atom/proc/CheckParts()
 	return
 
-/atom/Del()
-	// Pass to Destroy().
-	if(isnull(gc_destroyed)) // If we're just straight up calling del(atom), make sure anything in Destroy() gets called anyways just to be sure.
-		Destroy()
-	..()
-
 // Like Del(), but for qdel.
 // Called BEFORE qdel moves shit.
 // Also called on del()
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 02c1879151b..0c06a351d6c 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -23,9 +23,9 @@
 	return
 
 /atom/movable/Del()
-	if(!gc_destroyed && loc)
+	if(isnull(gc_destroyed) && loc)
 		testing("GC: -- [type] was deleted via del() rather than qdel() --")
-//	else if(!gc_destroyed)
+//	else if(isnull(gc_destroyed))
 //		testing("GC: [type] was deleted via GC without qdel()") //Not really a huge issue but from now on, please qdel()
 //	else
 //		testing("GC: [type] was deleted via GC with qdel()")
diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm
index ae68c995671..8116544117e 100644
--- a/code/modules/mob/camera/camera.dm
+++ b/code/modules/mob/camera/camera.dm
@@ -12,4 +12,8 @@
 	move_on_shuttle = 0
 
 /mob/camera/experience_pressure_difference()
-	return
\ No newline at end of file
+	return
+
+/mob/camera/Destroy()
+	..()
+	del(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index c1b235d5efb..f46e52a0aa5 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -5,9 +5,10 @@
 		cur_area.mob_activate(src)
 
 /mob/living/Destroy()
-	if(mind)
-		mind.current = null
+//	if(mind)
+//		mind.current = null
 	..()
+	del(src)
 
 /mob/living/verb/succumb(var/whispered as null)
 	set hidden = 1