diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 10c396c0a0eeb1aefc6a8653fd13578290cd9484..b5634b1768640bdafcc0274206799acd4d4121f0 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -297,20 +297,33 @@ $He has <<if $activeSlave.horn == "none">>no horns<<else>>$activeSlave.horn<</if
 <<if $activeSlave.indentureRestrictions >= 2>>
 	//$His indenture forbids elective surgery//
 <<elseif $activeSlave.horn != "none">>
-	[[Remove them|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "hornGone"]]<</if>>
+	<<if $activeSlave.horn != "one long oni horn">>
+		[[Remove them|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "hornGone"]]
+	<<else>>
+		[[Remove it|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "hornGone"]]
+	<</if>>
+<</if>>
+<<if $activeSlave.horn == "none">>
 	Give $him:
-<<if $activeSlave.horn != "curved succubus horns">>
-	[[Succubus horns|Surgery Degradation][$activeSlave.horn = "curved succubus horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
-<<if $activeSlave.horn != "backswept horns">>
-	| [[Backswept horns|Surgery Degradation][$activeSlave.horn = "backswept horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
-<<if $activeSlave.horn != "cow horns">>
-	| [[Bovine horns|Surgery Degradation][$activeSlave.horn = "cow horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
-<<if $activeSlave.horn != "one long oni horn">>
-	| [[an oni horn|Surgery Degradation][$activeSlave.horn = "one long oni horn", $activeSlave.hornColor = $activeSlave.skin, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
-<<if $activeSlave.horn != "two long oni horns">>
-	| [[2 oni horns|Surgery Degradation][$activeSlave.horn = "two long oni horns", $activeSlave.hornColor = $activeSlave.skin, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
-<<if $activeSlave.horn != "small horns">>
-	| [[Small horns|Surgery Degradation][$activeSlave.horn = "small horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>>
+	<<if $activeSlave.horn != "curved succubus horns">>
+		[[Succubus horns|Surgery Degradation][$activeSlave.horn = "curved succubus horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]
+	<</if>>
+	<<if $activeSlave.horn != "backswept horns">>
+		| [[Backswept horns|Surgery Degradation][$activeSlave.horn = "backswept horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]
+	<</if>>
+	<<if $activeSlave.horn != "cow horns">>
+		| [[Bovine horns|Surgery Degradation][$activeSlave.horn = "cow horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]
+	<</if>>
+	<<if $activeSlave.horn != "one long oni horn">>
+		| [[an Oni horn|Surgery Degradation][$activeSlave.horn = "one long oni horn", $activeSlave.hornColor = $activeSlave.skin, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]
+	<</if>>
+	<<if $activeSlave.horn != "two long oni horns">>
+		| [[two Oni horns|Surgery Degradation][$activeSlave.horn = "two long oni horns", $activeSlave.hornColor = $activeSlave.skin, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]
+	<</if>>
+	<<if $activeSlave.horn != "small horns">>
+		| [[Small horns|Surgery Degradation][$activeSlave.horn = "small horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]
+	<</if>>
+<</if>>
 
 <br>&nbsp;&nbsp;&nbsp;&nbsp;
 $He has