diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index c5b2d6138a68cf763926a3a820307abab521a913..6f8c9cb2309ec814d00428b9c85d0b2d8da65e25 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -570,7 +570,7 @@
<</if>>
<</if>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
/* generate enemies
<<if _generateEnemies == 1>>
diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw
deleted file mode 100644
index 2fcc7d9b02572510c236ba64870302f723bbb052..0000000000000000000000000000000000000000
--- a/src/npc/removeActiveSlave.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Remove activeSlave [nobr]
-
-<<= removeActiveSlave() >>
diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw
index 993d24bd838fd233ef3d1a1374e17f9ad798ec91..9933056df25b2d9f01e587b5c1b9316ab38505e8 100644
--- a/src/pregmod/killedSlave.tw
+++ b/src/pregmod/killedSlave.tw
@@ -125,7 +125,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
<</if>>
<</if>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $nextLink = "AS Dump">>
/* TODO: this will DEFINTELY need balancing */
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index 7d4368e5661f24cbbd31cdead701bf667016b3e2..3b9ff5828d83bcc487020a4690cdc50afc43eb70 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -310,7 +310,7 @@
<</if>>
<<set $activeSlave = $slaves[_b]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<br><br><hr style="margin:0"><br>
<</if>>
diff --git a/src/pregmod/seDeath.tw b/src/pregmod/seDeath.tw
index 830a36069adb44b6445185337509d5edf6b15602..27e6a0cdc31efd6aa0a029e75c5b85a36aee4d15 100644
--- a/src/pregmod/seDeath.tw
+++ b/src/pregmod/seDeath.tw
@@ -30,7 +30,7 @@
<</if>>
<<foreach _slave of _killedSlaves>>
<<set $activeSlave = _slave>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</foreach>>
<<unset _killedSlaves>>
diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/societies/aztec/slaveSacrifice.tw
index ca94f7894a36f25aa1e743c9db3aae23c0f72e7e..fa1715ff4c228a8944949c82336d9c03c8e179d4 100644
--- a/src/societies/aztec/slaveSacrifice.tw
+++ b/src/societies/aztec/slaveSacrifice.tw
@@ -380,7 +380,7 @@
<<set $arcologies[0].FSAztecRevivalist += 1>>
<</if>>
<<set $slavesSacrificedThisWeek = ($slavesSacrificedThisWeek || 0) + 1>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>>
<<set $sacrificeType = 0>>
\ No newline at end of file
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index e6caf31f1afc29b974e8a20511e89d7e5f8fbec9..7c6f1188eea360f64d08db97e546f81d473c6cd1 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -245,7 +245,7 @@
<<if $activeSlave != 0>>
<<setLocalPronouns $activeSlave>>
<br> $activeSlave.slaveName is low-quality and surplus to the needs of the arcade, so $he has been converted into a Fuckdoll.
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<if $activeSlave == 0>> /% if not zero then technically there was an error INVALID SLAVE %/
<<set $fuckdolls++, _SL-->>
<</if>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index dd1e51dbf7fbcfbe5b4beb29e9d505e75f266655..88f68bcb0d943aa61afb68ca808cd50cca08380c 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -1114,7 +1114,7 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
<</if>>
<</if>>
<<set $activeSlave = $slaves[$i]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<break>>
<</if>>
<</for>>
diff --git a/src/uncategorized/pBioreactorPerfected.tw b/src/uncategorized/pBioreactorPerfected.tw
index ac0c1f2706e53767e63a750ae250762243dec1bc..b735712326c34c48b5bc73ebad8117b0d27bbd48 100644
--- a/src/uncategorized/pBioreactorPerfected.tw
+++ b/src/uncategorized/pBioreactorPerfected.tw
@@ -175,7 +175,7 @@ You stop and consider the cow, from $his titanic breasts to $his <<if ($activeSl
<<set $bioreactorsXY += 1>>
<</if>>
<</if>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $createBioreactors = 1>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index c0d6b0ba6217e168255fd79ebb454e1dfdb5797a..34d421f2873936292394c3232eaa78c46720caf4 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -71,7 +71,7 @@ The implant is small, and went off too far ahead to do anything more than stun.
<<run cashX(-1000, "event", $Bodyguard)>>
<<set $Bodyguard.health -= 1000>>
<<set $activeSlave = $Bodyguard>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>> /* closes $Bodyguard != 0 */
<<elseif $personalArms > 0>>
diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw
index de304d37efcbc28d137a53b5a5a48516ca79fa3c..a4b94636483b93fd770e4ba7f6128f835177589f 100644
--- a/src/uncategorized/pMercenaryRomeo.tw
+++ b/src/uncategorized/pMercenaryRomeo.tw
@@ -104,7 +104,7 @@ proffered by an attentive slave girl, he seems almost bashful.
<</if>>
$he gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." Soon the romantic story of The Mercenary and the Slave $Girl is being told in bars and brothels across the Free City, with you naturally playing @@.green;a supporting role.@@
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>>
<<unset $romeoID>>
<</replace>>
@@ -133,7 +133,7 @@ proffered by an attentive slave girl, he seems almost bashful.
<<run repX(15000, "event")>>
<<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + $activeSlave.slaveName>>
<<set $trinkets.push(_poster)>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>>
<<unset $romeoID>>
<</replace>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 58216bc0e6cd4dfd0a21f3e95638b0cbc3640732..fae96d32cb4fcebf856beb93ecb6795efd277ab9 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -169,7 +169,7 @@ that several nondescript citizens $he sees occasionally at work have passed a fe
<<set $traitorStats.traitorBody = $slaves[_myBody].ID>>
<</if>>
<</if>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</replace>>
<</link>>
<br><<link "Tell $him to ignore the Daughters in the future">>
@@ -202,7 +202,7 @@ that several nondescript citizens $he sees occasionally at work have passed a fe
You announce that a treasonous slave will be publicly executed. Treason is understood in the Free Cities to be activity that tends to undermine slavery, and public interest is considerable when $activeSlave.slaveName is dragged out into a public atrium and <<if $arcologies[0].FSAztecRevivalist !== "unset">>has $his heart cut out of $his living body<<elseif $arcologies[0].FSEdoRevivalist !== "unset">>is boiled alive<<elseif $arcologies[0].FSRomanRevivalist !== "unset">>is crucified and left hanging until $he perishes<<else>>is summarily hanged<</if>>. The populace understands the necessity of the punishment, though they are @@.red;disturbed@@ that such a thing could happen in your penthouse of all places. The surviving slaves are @@.gold;terrified@@ at the display, but at least you can be sure they will remember the price of failing you.
<<run repX(-500, "event", $activeSlave)>>
<<run $slaves.forEach(function(s) { s.trust -= 10 + random(10); })>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</replace>>
<</link>>
<</if>>
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index 3441cacdc5c00efadca6108c39f416cdd1d8a156..c317330265f311f58965d36ffc64cc0fe8709f71 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -203,5 +203,5 @@ The umpire announces gravely that the fight is to the death and rings a bell.
<</if>>
<<if $activeSlave.health < -90>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>>
diff --git a/src/uncategorized/reRebels.tw b/src/uncategorized/reRebels.tw
index 2d1bc299ec545f6e10a4022421afed55c5a971f3..c9d1470ecf7ba75d5150e86093b690c9ae3892bb 100644
--- a/src/uncategorized/reRebels.tw
+++ b/src/uncategorized/reRebels.tw
@@ -63,18 +63,18 @@ You have a rebel problem. $slaves[_i].slaveName and $slaves[_j].slaveName are bo
You start with $slaves[_i].slaveName and no sooner than you turn to $slaves[_j].slaveName do you hear the telltale clatter of the spoon hitting the floor. With a simple kick, the unfortunately loose $slaves[_i].slaveName is left struggling in the air. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> in horror as the life drains from _his2 former accomplice. @@.gold;_He2 promises to never cross you again.@@
<<set $slaves[_j].trust -= 20>>
<<set $activeSlave = $slaves[_i]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<elseif $slaves[_j].vagina > 3>>
You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Setting the spoon inside $slaves[_j].slaveName, you prepare to kick the stools out from under them; but the telltale clatter of the spoon hitting the floor saves you the trouble. With a simple kick, the unfortunately loose $slaves[_j].slaveName is left struggling in the air. $slaves[_i].slaveName <<if canSee($slaves[_i])>>watches<<elseif canHear($slaves[_i])>>listens<<else>>stares blankly<</if>> in horror as the life drains from $his former accomplice. @@.gold;$He promises to never cross you again.@@
<<set $slaves[_i].trust -= 20>>
<<set $activeSlave = $slaves[_j]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<elseif random(1,100) == 69>>
You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. They are both desperate to survive and clamp down as hard as they can, but it can't go on forever as the sounds of a spoon clattering to the floor fills the room. Both slaves freeze as they realize the other has lost their grip on the silverware, uncertain of what comes next. You answer the question by knocking the stools out from under them, allowing them both to hang. They came into this together and they are going out together.
<<set $activeSlave = $slaves[_i]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $activeSlave = $slaves[_j]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<elseif $slaves[_i].vagina == $slaves[_j].vagina && random(1,100) > 50>>
You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. They are both <<if $slaves[_i].vagina == 1>>quite tight, so it's no surprise when they put up a good show.<<else>>not the tightest slaves, so it's a surprise they manage to hold on as long as they do<</if>>. But it can't go on forever as the sound of the spoon clattering to the floor fills the room.
<<if random(1,100) <= 50>>
@@ -86,7 +86,7 @@ You have a rebel problem. $slaves[_i].slaveName and $slaves[_j].slaveName are bo
<<set $slaves[_j].trust -= -20, $slaves[_j].behavioralFlaw = "odd">>
<<set $activeSlave = $slaves[_i]>>
<</if>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<elseif $slaves[_j].vagina > $slaves[_i].vagina && random(1,100) > 50>>
You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. $slaves[_i].slaveName is the clear favorite in this game, but the looser $slaves[_j].slaveName refuses to give in, using _his2 experience to clamp down as hard as _he2 can. But it can't go on forever as the sound of the spoon clattering to the floor fills the room.
<<if random(1,100) <= 90>>
@@ -98,12 +98,12 @@ You have a rebel problem. $slaves[_i].slaveName and $slaves[_j].slaveName are bo
<<set $slaves[_j].trust -= -20, $slaves[_j].behavioralFlaw = "odd">>
<<set $activeSlave = $slaves[_i]>>
<</if>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<else>>
You start with $slaves[_i].slaveName before moving to $slaves[_j].slaveName as $he holds $his life between $his netherlips. Once both spoons are inserted, you sit back and watch them squirm at the cold metal in their most sensitive recesses. In a show of underhandedness, $slaves[_j].slaveName kicks $slaves[_i].slaveName, knocking $him off balance and sending $him hanging. $slaves[_j].slaveName <<if canSee($slaves[_j])>>watches<<elseif canHear($slaves[_j])>>listens<<else>>stares blankly<</if>> as the life drains from _his2 accomplice, @@.gold;horrified at what _he2 just did.@@ The ordeal @@.red;leaves _him2 behaving strangely.@@
<<set $slaves[_j].trust = -100, $slaves[_j].behavioralFlaw = "odd">>
<<set $activeSlave = $slaves[_i]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index b9480ddec488426fd97dff3a3c3deb5ebe871166..4d6da23a39cbb4c2f4f4b944950b6984acb05562 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -805,56 +805,56 @@ The failure of a prominent organization within your arcology has @@.red;affected
<<if ($slaves[$i].origin == "She was given to you by a failed branch campus of The Slavegirl School right after her majority.") || ($slaves[$i].origin == "She was given to you by a failed branch campus of The Slavegirl School after she was retrained as a slave girl.")>>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<<elseif $RESFailure == "GRI">>
<<if $slaves[$i].origin == "She was given to you by a failed subsidiary lab of the Growth Research Institute right after her use as a test subject ended.">>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<<elseif $RESFailure == "SCP">>
<<if $slaves[$i].origin == "She was given to you by a failed branch campus of St. Claver Preparatory after she served as a plastic surgeon's passing final exam.">>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<<elseif $RESFailure == "LDE">>
<<if $slaves[$i].origin == "She was given to you by a failed branch campus of the innovative École des Enculées right after her graduation.">>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<<elseif $RESFailure == "TGA">>
<<if $slaves[$i].origin == "She was given to you by a failed branch campus of the intense Gymnasium-Academy right after her majority.">>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<<elseif $RESFailure == "HA">>
<<if $slaves[$i].origin == "She was given to you by a failed branch campus of the Hippolyta Academy right after her majority.">>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<<elseif $RESFailure == "TCR">>
<<if $slaves[$i].origin == "She is a prized dairy cow given to you by a failed local pasture of The Cattle Ranch.">>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<<else>>
<<if ($slaves[$i].origin == "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.") || ($slaves[$i].origin == "She was a Futanari Sister until you engineered her early enslavement.")>>
<<slaveCost $slaves[$i]>>
<<run cashX($slaveCost, "slaveTransfer")>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $i -= 1>>
<</if>>
<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 6d9c95ec11bb3e296d5f22be7db86a9630caac5b..7ef2a974987c6d580ad47302bdd07c1e2acb0df1 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -4,7 +4,7 @@
<<if $expired == 1>>
<<set $activeSlave = getSlave($expiree), $expiree = 0>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture == 0>>
<<set $expiree = $slaves[$i].ID>>
@@ -16,7 +16,7 @@
<<if $retired == 1>>
<<set $activeSlave = getSlave($retiree), $retiree = 0>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if $slaves[$i].indenture < 0>>
<<if $slaves[$i].actualAge >= $retirementAge && $PhysicalRetirementAgePolicy != 1>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index e35f7fb49be0f9a92d2f9fc5e40fc135cd43639c..43ef5b9bbd839947c2b6daa7cb1874652624fdec 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -125,7 +125,7 @@ I need to break single passage to several widgets, as it's been overcomplicated
<<set $slaves[$i].laborCount++>>
<<else>>
<<set $activeSlave = $slaves[$i]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $slaveDead = 0>>
<</if>>
<br><br><hr style="margin:0"><br>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 08c63f6c1a043b8c9c6e25add00fecb84611b580..756e7b16bc4328cb1056d16ddabfafff02759b38 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -824,9 +824,9 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<</if>>
<<if $pitAnimal == 0>>
<<set $activeSlave = getSlave(_loser.ID)>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>>
<<else>>
<<set $activeSlave = getSlave(_loser.ID)>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index 2f690eedde5b18df77136bd3a8a790ed445fcde4..64a38f05d82b344254879ad20b9cc83f8d089a4a 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -231,7 +231,7 @@ Your arcology has gained a well-off citizen.
<<set _sr = $slaveIndices[_clonedSlave.relationshipTarget]>> /* must be reset since $activeSlave may already be removed from $slaves */
$He doesn't get far before $he <<if canHear(_clonedSlave)>>hears a desperate pursuit behind $him<<else>>feels a gentle tap on $his shoulder<</if>>. It's $his <<if _clonedSlave.relationship >= 5>>wife<<else>>lover<</if>>, $slaves[_sr].slaveName, <<if canHear(_clonedSlave)>>hurrying to catch<<else>>finally catching<</if>> up. Watching on the monitors, you see _clonedSlave.slaveName's mixed pleasure and pain at seeing _him2 again so soon, followed by a tearful explanation and an embrace so heartfelt that the pair of ex-slaves collapse to the floor together, sobbing.
<<set $activeSlave = $slaves[_sr]>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<br><br>
<<if $arcologies[0].FSPaternalist != "unset">>
Of course, your paternalistic arcology thinks this @@.green;almost too romantic,@@ and there are jesting suggestions that outcomes this adorable ought to be illegal. The pair becomes celebrated citizens immediately.
@@ -399,5 +399,5 @@ You have @@.yellowgreen;gained a menial slave.@@
<<else>> /* manually retired */
<<set $nextLink = "Main">>
<<set $activeSlave = getSlave($retiree), $retiree = 0, $retired = 0>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 3c431f759851a11f82d62b45811f8d9f278908a4..ba512bd341d9758af1a1955e1ef972c51bea7aa5 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -1178,4 +1178,4 @@
<</if>>
<</if>>
-<<include "Remove activeSlave">>
+<<= removeActiveSlave() >>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 54f0a20de15fc80afc3dfdb5c97d90f1cf56bab6..6bb84c89910e630155e7ec0b7340219acc58b959 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -32,7 +32,7 @@
<<if $surgeryType == "ocular implant">>At least the ocular implants are still good.<<set $stockpile.ocularImplant++>><</if>>
<<if $surgeryType == "cochlear implant">>At least the cochlear implants are still good.<<set $stockpile.cochlearImplant++>><</if>>
<<if $surgeryType == "electrolarynx">>At least the electrolarynx is still good.<<set $stockpile.electrolarynx++>><</if>>
- <<include "Remove activeSlave">>
+ <<= removeActiveSlave() >>
<<set $nextLink = "Main">>
<<elseif $surgeryType == "breastShapePreservation" && (($activeSlave.health-($activeSlave.boobs/1000)) < random(-100,-80))>>
$activeSlave.slaveName's mesh implantation @@.red;has gone wrong, resulting in a mastectomy!@@