diff --git a/Defs/WorkGiverDefs/WorkGivers.xml b/Defs/WorkGiverDefs/WorkGivers.xml
index ba0ad8f..b11d323 100644
--- a/Defs/WorkGiverDefs/WorkGivers.xml
+++ b/Defs/WorkGiverDefs/WorkGivers.xml
@@ -1,208 +1,44 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <WorkGivers>
 
-	<!-- ============= Doctor ============= -->
-
-	<WorkGiverDef>
-		<defName>DoctorTreatEmergency</defName>
-		<label>give emergency treatment</label>
-		<giverClass>WorkGiver_TendEmergency</giverClass>
-		<workType>Doctor</workType>
-		<emergency>true</emergency>
-		<priorityInType>100</priorityInType>
-		<prioritizeSustains>true</prioritizeSustains>
-		<verb>treat</verb>
-		<gerund>treating</gerund>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
-	<WorkGiverDef>
-		<defName>DoctorRescue</defName>
-		<label>rescue downed allies to bed</label>
-		<giverClass>WorkGiver_RescueDowned</giverClass>
-		<workType>Doctor</workType>
-		<priorityInType>80</priorityInType>
-		<verb>rescue</verb>
-		<gerund>rescuing</gerund>
-		<directOrderable>false</directOrderable>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
-	<WorkGiverDef>
-		<defName>DoBillsMedicalHumanOperation</defName>
-		<label>operate on humanlikes</label>
-		<giverClass>WorkGiver_DoBill</giverClass>
-		<workType>Doctor</workType>
-		<priorityInType>70</priorityInType>
-		<billGiversAllHumanlikes>true</billGiversAllHumanlikes>
-		<billGiversAllHumanlikesCorpses>true</billGiversAllHumanlikesCorpses>
-		<verb>operate</verb>
-		<gerund>operating on</gerund>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-		<prioritizeSustains>true</prioritizeSustains>
-	</WorkGiverDef>
-	
-	<WorkGiverDef>
-		<defName>DoBillsMedicalAnimalOperation</defName>
-		<label>operate on animals</label>
-		<giverClass>WorkGiver_DoBill</giverClass>
-		<workType>Doctor</workType>
-		<priorityInType>60</priorityInType>
-		<billGiversAllAnimals>true</billGiversAllAnimals>
-		<billGiversAllAnimalsCorpses>true</billGiversAllAnimalsCorpses>
-		<verb>operate</verb>
-		<gerund>operating on</gerund>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-		<prioritizeSustains>true</prioritizeSustains>
-	</WorkGiverDef>
-
-	<WorkGiverDef>
-		<defName>DoctorTreat</defName>
-		<label>give treatment</label>
-		<giverClass>WorkGiver_Tend</giverClass>
-		<workType>Doctor</workType>
-		<priorityInType>50</priorityInType>
-		<prioritizeSustains>true</prioritizeSustains>
-		<verb>treat</verb>
-		<gerund>treating</gerund>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
-	<WorkGiverDef>
-		<defName>DoctorFeed</defName>
-		<label>feed patients</label>
-		<giverClass>WorkGiver_FeedPatient</giverClass>
-		<workType>Doctor</workType>
-		<priorityInType>40</priorityInType>
-		<prioritizeSustains>true</prioritizeSustains>
-		<verb>feed</verb>
-		<gerund>feeding</gerund>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
-	<WorkGiverDef>
-		<defName>TakeToBedToOperate</defName>
-		<label>take patients to bed for operations</label>
-		<giverClass>WorkGiver_TakeToBedToOperate</giverClass>
-		<workType>Doctor</workType>
-		<priorityInType>5</priorityInType>
-		<verb>take to operate</verb>
-		<gerund>taking to operate</gerund>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
-	<!-- ============= Warden ============= -->
-
-	<WorkGiverDef>
-		<defName>DoExecution</defName>
-		<label>execute prisoners</label>
-		<giverClass>WorkGiver_Warden_DoExecution</giverClass>
-		<workType>Warden</workType>
-		<verb>do execution on</verb>
-		<gerund>doing execution on</gerund>
-		<priorityInType>110</priorityInType>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
-	<WorkGiverDef>
-		<defName>ReleasePrisoner</defName>
-		<label>release prisoners</label>
-		<giverClass>WorkGiver_Warden_ReleasePrisoner</giverClass>
-		<workType>Warden</workType>
-		<verb>release</verb>
-		<gerund>releasing</gerund>
-		<priorityInType>100</priorityInType>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
-	<WorkGiverDef>
-		<defName>TakePrisonerToBed</defName>
-		<label>take prisoners to bed</label>
-		<giverClass>WorkGiver_Warden_TakeToBed</giverClass>
-		<workType>Warden</workType>
-		<verb>take to bed</verb>
-		<gerund>taking to bed</gerund>
-		<priorityInType>90</priorityInType>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
+	<!-- ============= Construction ============= -->
 
 	<WorkGiverDef>
-		<defName>FeedPrisoner</defName>
-		<label>feed prisoners</label>
-		<giverClass>WorkGiver_Warden_Feed</giverClass>
-		<workType>Warden</workType>
-		<verb>feed</verb>
-		<gerund>feeding</gerund>
-		<priorityInType>80</priorityInType>
+		<defName>RemoveRoofs</defName>
+		<label>remove roofs</label>
+		<giverClass>WorkGiver_RemoveRoof</giverClass>
+		<workType>Construction</workType>
+		<priorityInType>200</priorityInType>
+		<verb>remove roof</verb>
+		<gerund>removing roof</gerund>
+		<scanThings>false</scanThings>
+		<scanCells>true</scanCells>
 		<requiredCapacities>
 			<li>Manipulation</li>
 		</requiredCapacities>
 	</WorkGiverDef>
 
 	<WorkGiverDef>
-		<defName>DeliverFoodToPrisoner</defName>
-		<label>deliver food to prisoners</label>
-		<giverClass>WorkGiver_Warden_DeliverFood</giverClass>
-		<workType>Warden</workType>
-		<verb>deliver food for</verb>
-		<gerund>delivering food for</gerund>
-		<priorityInType>70</priorityInType>
+		<defName>BuildRoofs</defName>
+		<label>build roofs</label>
+		<giverClass>WorkGiver_BuildRoof</giverClass>
+		<workType>Construction</workType>
+		<priorityInType>190</priorityInType>
+		<verb>build roof</verb>
+		<gerund>building roof</gerund>
+		<scanThings>false</scanThings>
+		<scanCells>true</scanCells>
 		<requiredCapacities>
 			<li>Manipulation</li>
 		</requiredCapacities>
 	</WorkGiverDef>
 
-	<WorkGiverDef>
-		<defName>VisitSickPawn</defName>
-		<label>visit sick people</label>
-		<giverClass>WorkGiver_VisitSickPawn</giverClass>
-		<workType>Warden</workType>
-		<priorityInType>60</priorityInType>
-		<verb>visit</verb>
-		<gerund>visiting</gerund>
-	</WorkGiverDef>
-
-	<WorkGiverDef>
-		<defName>ChatWithPrisoner</defName>
-		<label>chat with prisoners</label>
-		<giverClass>WorkGiver_Warden_Chat</giverClass>
-		<workType>Warden</workType>
-		<verb>chat with</verb>
-		<gerund>chatting with</gerund>
-		<priorityInType>50</priorityInType>
-		<requiredCapacities>
-			<li>Talking</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
-	<!-- ============= Construction ============= -->
-
 	<WorkGiverDef>
 		<defName>ConstructFinishFrames</defName>
 		<label>construct placed frames</label>
 		<giverClass>WorkGiver_ConstructFinishFrames</giverClass>
 		<workType>Construction</workType>
-		<priorityInType>200</priorityInType>
+		<priorityInType>180</priorityInType>
 		<verb>construct</verb>
 		<gerund>constructing</gerund>
 		<requiredCapacities>
@@ -212,27 +48,12 @@
 		<prioritizeSustains>true</prioritizeSustains>
 	</WorkGiverDef>
 
-	<WorkGiverDef>
-		<defName>BuildRoofs</defName>
-		<label>build roofs</label>
-		<giverClass>WorkGiver_BuildRoof</giverClass>
-		<workType>Construction</workType>
-		<priorityInType>190</priorityInType>
-		<verb>build roof</verb>
-		<gerund>building roof</gerund>
-		<scanThings>false</scanThings>
-		<scanCells>true</scanCells>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
-
 	<WorkGiverDef>
 		<defName>ConstructDeliverResourcesToFrames</defName>
 		<label>deliver resources to frames</label>
 		<giverClass>WorkGiver_ConstructDeliverResourcesToFrames</giverClass>
 		<workType>Construction</workType>
-		<priorityInType>180</priorityInType>
+		<priorityInType>170</priorityInType>
 		<verb>work on</verb>
 		<gerund>working on</gerund>
 		<requiredCapacities>
@@ -247,7 +68,7 @@
 		<label>deliver resources to blueprints</label>
 		<giverClass>WorkGiver_ConstructDeliverResourcesToBlueprints</giverClass>
 		<workType>Construction</workType>
-		<priorityInType>170</priorityInType>
+		<priorityInType>110</priorityInType>
 		<verb>work on</verb>
 		<gerund>working on</gerund>
 		<requiredCapacities>
@@ -256,21 +77,6 @@
 		<canBeDoneByNonColonists>true</canBeDoneByNonColonists>
 		<prioritizeSustains>true</prioritizeSustains>
 	</WorkGiverDef>
-	
-	<WorkGiverDef>
-		<defName>RemoveRoofs</defName>
-		<label>remove roofs</label>
-		<giverClass>WorkGiver_RemoveRoof</giverClass>
-		<workType>Construction</workType>
-		<priorityInType>110</priorityInType>
-		<verb>remove roof</verb>
-		<gerund>removing roof</gerund>
-		<scanThings>false</scanThings>
-		<scanCells>true</scanCells>
-		<requiredCapacities>
-			<li>Manipulation</li>
-		</requiredCapacities>
-	</WorkGiverDef>
 
 	<WorkGiverDef>
 		<defName>Deconstruct</defName>