diff --git a/src/npc/fucktoyWorkaround.tw b/src/npc/fucktoyWorkaround.tw
deleted file mode 100644
index 86343cdfbaa91836e445b1cd00f0f156d7cc665b..0000000000000000000000000000000000000000
--- a/src/npc/fucktoyWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Fucktoy Workaround [silently]
-
-<<assignJob $slaves[$i] "please you">>
-
-<<goto "Main">>
-
diff --git a/src/npc/restWorkaround.tw b/src/npc/restWorkaround.tw
deleted file mode 100644
index 439a7300a1261fe32213a9dcb9bff45e22bd0c69..0000000000000000000000000000000000000000
--- a/src/npc/restWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Rest Workaround [silently]
-
-<<removeJob $slaves[$i] $slaves[$i].assignment>>
-
-<<goto "Main">>
-
diff --git a/src/npc/servantWorkaround.tw b/src/npc/servantWorkaround.tw
deleted file mode 100644
index 427529ebf4e572238143909dcf8ead3f8a841d52..0000000000000000000000000000000000000000
--- a/src/npc/servantWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Servant Workaround [silently]
-
-<<assignJob $slaves[$i] "be a servant">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/classesWorkaround.tw b/src/uncategorized/classesWorkaround.tw
deleted file mode 100644
index 1e61bdde3157f3cf45d94048649d1e481e215e61..0000000000000000000000000000000000000000
--- a/src/uncategorized/classesWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Classes Workaround [silently]
-
-<<assignJob $slaves[$i] "take classes">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/confinementWorkaround.tw b/src/uncategorized/confinementWorkaround.tw
deleted file mode 100644
index c157a6185f5578bd9e418db9ced21db16b7ab437..0000000000000000000000000000000000000000
--- a/src/uncategorized/confinementWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Confinement Workaround [silently]
-
-<<assignJob $slaves[$i] "stay confined">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/holeWorkaround.tw b/src/uncategorized/holeWorkaround.tw
deleted file mode 100644
index f5a07f47aea80ebf8ada4482c909ddfc3ba5621a..0000000000000000000000000000000000000000
--- a/src/uncategorized/holeWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Hole Workaround [silently]
-
-<<assignJob $slaves[$i] "work a glory hole">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/milkingWorkaround.tw b/src/uncategorized/milkingWorkaround.tw
deleted file mode 100644
index f64bf7c03172e99732e4dcedb7215947204099e6..0000000000000000000000000000000000000000
--- a/src/uncategorized/milkingWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Milking Workaround [silently]
-
-<<assignJob $slaves[$i] "get milked">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/publicServantWorkaround.tw b/src/uncategorized/publicServantWorkaround.tw
deleted file mode 100644
index 7742aa735e90130b14ed87fd47e18ad5bbe51a86..0000000000000000000000000000000000000000
--- a/src/uncategorized/publicServantWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Public Servant Workaround [silently]
-
-<<assignJob $slaves[$i] "serve the public">>
-
-<<goto "Main">>
-
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 0ebcb60f14c6c1d131afb2e3651cdfb15e7d010a..34c7638ce6e245331f084673595f781254796c03 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -90,7 +90,7 @@
 
 <<switch _Pass>>
 <<case "Main">>
-	
+
 	<<if $useSlaveSummaryTabs == 1>>
 		<<if $slaveAssignmentTab == "overview">>
 			<<if $showOneSlave == "Head Girl">>
@@ -100,7 +100,7 @@
 			<<elseif $showOneSlave == "guard you">>
 				<<if (_Slave.assignment != "guard you")>><<continue>><</if>>
 			<</if>>
-			
+
 		<<elseif $slaveAssignmentTab == "resting">>
 			<<if _Slave.assignment != "rest">><<continue>><</if>>
 		<<elseif $slaveAssignmentTab == "stay confined">>
@@ -129,7 +129,7 @@
 			<</if>>
 		<</if>>
 	<</if>>
-	
+
 	<<if (_Slave.choosesOwnClothes == 1) && (_Slave.clothes == "choosing her own clothes")>>
 		<<set $i = _ssi, _oldDevotion = _Slave.devotion>>
 		<<silently>><<include "SA chooses own clothes">><</silently>>
@@ -142,7 +142,7 @@
 	<</if>>
 	<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == _Slave.ID; }) != -1>>''@@.lightcoral;PA@@''<</if>>
 	[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */
-	
+
 <<case "Personal Attention Select">>
 	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
 	<<link _slaveName>>
@@ -508,7 +508,7 @@ will
 
 <<if ($displayAssignments == 1) && (_Pass == "Main") && (_Slave.ID != $HeadGirl.ID) && (_Slave.ID != $Recruiter.ID) && (_Slave.ID != $Bodyguard.ID)>>
 	<<if _Slave.assignment != "rest">>
-		<<link "Rest" "Main">><<assignJob $slaves[_ssi] "rest">><</link>>
+		<<link "Rest" "Main">><<removeJob $slaves[_ssi] $slaves[_ssi].assignment>><</link>>
 	<<else>>
 		Rest
 	<</if>>
@@ -565,7 +565,7 @@ will
 <</if>>
 
 <<set _numFacilities = $brothel+$club+$dairy+$servantsQuarters+$masterSuite+$spa+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
-	
+
 <<if _numFacilities > 0>>
 
 	<<if _Pass == "Main" || _Pass == "Head Girl Suite" || _Pass == "Spa" || _Pass == "Brothel" || _Pass == "Club" || _Pass == "Arcade" || _Pass == "Clinic" || _Pass == "Schoolroom" || _Pass == "Dairy" || _Pass == "Servants' Quarters" || _Pass == "Master Suite" || _Pass == "Cellblock" >>
@@ -574,11 +574,11 @@ will
 	<br>Transfer to:
 
 	<<if _Slave.assignment != "rest" && _Slave.assignment != "please you" && _Slave.assignment != "take classes" && _Slave.assignment != "be a servant" && _Slave.assignment != "whore" && _Slave.assignment != "serve the public" && _Slave.assignment != "get milked" && _Slave.assignment != "stay confined">>
-		<<link "Penthouse" "Main">><<assignJob $slaves[_ssi] "rest">><</link>>
+		<<link "Penthouse" "Main">><<removeJob $slaves[_ssi] $slaves[_ssi].assignment>><</link>>
 	<<else>>
 		Penthouse |
 	<</if>>
-			
+
 	<<if $arcade != 0>>
 		<<if $arcade > $arcadeSlaves && (_Slave.indentureRestrictions <= 0) && _Slave.breedingMark != 1>>
 			[[Arcade|Assign][$assignTo = "Arcade", $i = _ssi]] /* $i = -1 tells Assign to use _Slave as-is */
diff --git a/src/uncategorized/whoreWorkaround.tw b/src/uncategorized/whoreWorkaround.tw
deleted file mode 100644
index d5ada4531e76dffaccd5b636a20a0915ac8cc151..0000000000000000000000000000000000000000
--- a/src/uncategorized/whoreWorkaround.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: Whore Workaround [silently]
-
-<<assignJob $slaves[$i] "whore">>
-
-<<goto "Main">>
-