diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 826bc04beea..0d47420edc9 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -1,5 +1,3 @@
-var/list/clonecomputers = list()
-
 /obj/machinery/computer/cloning
 	name = "cloning console"
 	icon = 'icons/obj/computer.dmi'
@@ -28,13 +26,8 @@ var/list/clonecomputers = list()
 	..()
 	updatemodules()
 
-/obj/machinery/computer/cloning/New()
-	..()
-	clonecomputers += src
-
 /obj/machinery/computer/cloning/Destroy()
 	releasecloner()
-	clonecomputers -= src
 	return ..()
 
 /obj/machinery/computer/cloning/process()
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index e9e3a309da7..807d3caf261 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -290,9 +290,9 @@
 					continue
 				O.loc = src
 
-	for(var/obj/machinery/computer/cloning/cloner in clonecomputers)
+	for(var/obj/machinery/computer/cloning/cloner in machines)
 		for(var/datum/dna2/record/R in cloner.records)
-			if(R.ckey == occupant.ckey)
+			if(occupant.mind == locate(R.mind))
 				cloner.records.Remove(R)
 
 	//Delete all items not on the preservation list.