diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 7b8a7069c4c..9e80082b735 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -57,23 +57,22 @@
 	else
 		user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.."
 
-/obj/item/organ/internal/brain/remove(var/mob/living/user,var/special)
+/obj/item/organ/internal/brain/remove(var/mob/living/user,special = 0)
 
-	//if(!owner) return ..() // Probably a redundant removal; just bail
+	if(!owner) return ..() // Probably a redundant removal; just bail
 
 	var/obj/item/organ/internal/brain/B = src
-	if(istype(B) && istype(owner) && is_primary_organ())
+	if(!special)
 		var/mob/living/simple_animal/borer/borer = owner.has_brain_worms()
 
 		if(borer)
 			borer.detatch() //Should remove borer if the brain is removed - RR
 
-		owner.brain_op_stage = 4.0
-		B.transfer_identity(owner)
+		B.transfer_identity(user)
 
 	..()
 
-/obj/item/organ/internal/brain/insert(var/mob/living/target)
+/obj/item/organ/internal/brain/insert(var/mob/living/target,special = 0)
 
 	var/brain_already_exists = 0
 	if(istype(target,/mob/living/carbon/human)) // No more IPC multibrain shenanigans
@@ -84,9 +83,6 @@
 	if(!brain_already_exists)
 		if(target.key)
 			target.ghostize()
-		var/mob/living/carbon/C = target
-		if(istype(C))
-			C.brain_op_stage = 1.0
 		if(brainmob)
 			if(brainmob.mind)
 				brainmob.mind.transfer_to(target)
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index 167aa46f1a0..95e81d48e65 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -251,7 +251,7 @@
 	user.visible_message("<span class='notice'> [user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].</span>", \
 	"<span class='notice'> You amputate [target]'s [affected.name] with \the [tool].</span>")
 
-	add_logs(target,user ,"surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")
+	add_logs(target,user ,"surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it
 
 	affected.droplimb(1,DROPLIMB_EDGE)
 	return 1
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 485fea32026..7ef72440413 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -683,7 +683,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 			victim.UpdateDamageIcon()
 			victim.regenerate_icons()
 		dir = 2
-
+	add_logs(target,user ,"removed [src.name] from ", addition="INTENT: [uppertext(user.a_intent)]")
 	switch(disintegrate)
 		if(DROPLIMB_EDGE)
 			compile_icon()