diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 98fdfeece38..15a3dd04d12 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -114,14 +114,12 @@
 	..()
 	rename_character(null, "Integrated Robotic Chassis ([rand(1, 9999)])")
 	update_dna()
-	spawn(2) // organ icon code has a spawn in it, if we don't have this, this will runtime. Disgusting
-		for(var/obj/item/organ/external/E in bodyparts)
-			if(istype(E, /obj/item/organ/external/chest) || istype(E, /obj/item/organ/external/groin))
-				continue
-			qdel(E)
-		for(var/obj/item/organ/O in internal_organs)
-			qdel(O)
-		regenerate_icons()
+	for(var/obj/item/organ/external/E in bodyparts)
+		if(istype(E, /obj/item/organ/external/chest) || istype(E, /obj/item/organ/external/groin))
+			continue
+		qdel(E)
+	for(var/obj/item/organ/O in internal_organs)
+		qdel(O)
 	death()
 
 /mob/living/carbon/human/shadow/Initialize(mapload)
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index a0ca54c8e01..cefe9554d41 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -110,8 +110,7 @@
 	if(istype(H))
 		replaced(H)
 		sync_colour_to_human(H)
-	spawn(1)
-		get_icon()
+	get_icon()
 
 /obj/item/organ/external/replaced(var/mob/living/carbon/human/target)
 	owner = target
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index 7a8fa58828a..5eb8bd143f1 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -116,16 +116,14 @@
 	. = ..()
 
 /obj/item/organ/internal/brain/mmi_holder/posibrain/New()
-	stored_mmi = new /obj/item/mmi/robotic_brain/positronic(src)
 	..()
-	spawn(1)
-		if(!QDELETED(src))
-			if(owner)
-				stored_mmi.name = "positronic brain ([owner.real_name])"
-				stored_mmi.brainmob.real_name = owner.real_name
-				stored_mmi.brainmob.name = stored_mmi.brainmob.real_name
-				stored_mmi.icon_state = "posibrain-occupied"
-				update_from_mmi()
-			else
-				stored_mmi.loc = get_turf(src)
-				qdel(src)
\ No newline at end of file
+	stored_mmi = new /obj/item/mmi/robotic_brain/positronic(src)
+	if(owner)
+		stored_mmi.name = "positronic brain ([owner.real_name])"
+		stored_mmi.brainmob.real_name = owner.real_name
+		stored_mmi.brainmob.name = stored_mmi.brainmob.real_name
+		stored_mmi.icon_state = "posibrain-occupied"
+		update_from_mmi()
+	else
+		stored_mmi.forceMove(get_turf(src))
+		qdel(src)
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm
index 1a548de7d0a..c83678a71a5 100644
--- a/code/modules/surgery/organs/subtypes/standard.dm
+++ b/code/modules/surgery/organs/subtypes/standard.dm
@@ -194,12 +194,10 @@
 			owner.unEquip(owner.r_ear)
 		if(owner.wear_mask)
 			owner.unEquip(owner.wear_mask)
-		spawn(1)
-			if(owner)//runtimer no runtiming
-				owner.update_hair()
-				owner.update_fhair()
-				owner.update_head_accessory()
-				owner.update_markings()
+		owner.update_hair()
+		owner.update_fhair()
+		owner.update_head_accessory()
+		owner.update_markings()
 	. = ..()
 
 /obj/item/organ/external/head/replaced()