Index: binaries/data/mods/public/simulation/templates/mixins/builder.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/mixins/builder.xml
+++ binaries/data/mods/public/simulation/templates/mixins/builder.xml
@@ -4,12 +4,12 @@
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}/civil_centre
-      structures/{civ}/ministry
       structures/{civ}/crannog
       structures/{civ}/military_colony
       structures/{civ}/house
+      structures/{civ}/apartment
+      structures/{civ}/ice_house
       structures/{civ}/pyramid_small
-      structures/{civ}/apartment
       structures/{civ}/storehouse
       structures/{civ}/farmstead
       structures/{civ}/field
@@ -17,21 +17,42 @@
       structures/{civ}/dock
       structures/{civ}/barracks
       structures/{civ}/stable
-      structures/{civ}/elephant_stable
       structures/{civ}/forge
+      structures/{civ}/ministry
       structures/{civ}/temple
+      structures/{civ}/temple_vesta
       structures/{civ}/market
-      structures/{civ}/outpost
-      structures/{civ}/sentry_tower
-      structures/{civ}/defense_tower
-      structures/{civ}/arsenal
       structures/{civ}/academy
-      structures/{civ}/fortress
+      structures/{civ}/army_camp
+      structures/{civ}/camp_blemmye
+      structures/{civ}/camp_noba
+      structures/{civ}/embassy_celtic
+      structures/{civ}/embassy_iberian
+      structures/{civ}/embassy_italic
+      structures/{civ}/gymnasium
       structures/wallset_palisade
       structures/{civ}/wallset_palisade
+      structures/{civ}/outpost
+      structures/{civ}/sentry_tower
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
+      structures/{civ}/defense_tower
+      structures/{civ}/fortress
+      structures/{civ}/arsenal
+      structures/{civ}/elephant_stable
       structures/{civ}/theater
+      structures/{civ}/pyramid_large
+      structures/{civ}/temple_amun
+      structures/{civ}/apadana
+      structures/{civ}/assembly
+      structures/{civ}/monument
+      structures/{civ}/palace
+      structures/{civ}/pillar_ashoka
+      structures/{civ}/lighthouse
+      structures/{civ}/library
+      structures/{civ}/syssiton
+      structures/{civ}/prytaneion
+      structures/{civ}/super_dock
       structures/{civ}/wonder
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/mixins/civ/athen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/mixins/civ/athen.xml
+++ binaries/data/mods/public/simulation/templates/mixins/civ/athen.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
-  <Builder merge="">
-    <Entities datatype="tokens">
-      structures/athen/gymnasium
-      structures/athen/prytaneion
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/structures/mace/library.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace/library.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace/library.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_library">
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Bibliothēkē</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/macedonians/library.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/sele/library.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele/library.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele/library.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_library">
-  <Footprint>
-    <Square width="26.0" depth="26.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>sele</Civ>
-    <SpecificName>Bibliothēkē</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Static width="24.0" depth="24.0"/>
-  </Obstruction>
-  <VisualActor>
-    <Actor>structures/seleucids/library.xml</Actor>
-    <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_archer_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/cart/super_dock
-      structures/cart/embassy_celtic
-      structures/cart/embassy_iberian
-      structures/cart/embassy_italic
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>units/cart/infantry_archer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/{civ}/super_dock
-      structures/{civ}/embassy_celtic
-      structures/{civ}/embassy_iberian
-      structures/{civ}/embassy_italic
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Iberian Mercenary Skirmisher</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_ranged_slinger">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/{civ}/super_dock
-      structures/{civ}/embassy_celtic
-      structures/{civ}/embassy_iberian
-      structures/{civ}/embassy_italic
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Balearic Slinger</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_spearman_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="hoplite|template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/cart/super_dock
-      structures/cart/embassy_celtic
-      structures/cart/embassy_iberian
-      structures/cart/embassy_italic
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>units/cart/infantry_spearman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/{civ}/super_dock
-      structures/{civ}/embassy_celtic
-      structures/{civ}/embassy_iberian
-      structures/{civ}/embassy_italic
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/{civ}/super_dock
-      structures/{civ}/embassy_celtic
-      structures/{civ}/embassy_iberian
-      structures/{civ}/embassy_italic
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Samnite Swordsman</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/cart/super_dock
-      structures/cart/embassy_celtic
-      structures/cart/embassy_iberian
-      structures/cart/embassy_italic
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Aštāh</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/gaul/assembly
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_javelineer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/gaul/assembly
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_slinger_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/gaul/assembly
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_spearman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/gaul/assembly
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Celtic Woman</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/iber/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/infantry_javelineer_b.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber/monument
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/infantry_javelineer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber/monument
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/infantry_slinger_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber/monument
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/infantry_spearman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/iber/infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/infantry_swordsman_b.xml
@@ -5,11 +5,6 @@
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
     </Melee>
   </Attack>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber/monument
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/infantry_swordsman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/iber/monument
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Emazteki</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/kush/pyramid_large
-      structures/kush/temple_amun
-      structures/kush/camp_blemmye
-      structures/kush/camp_noba
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/kush/pyramid_large
-      structures/kush/temple_amun
-      structures/kush/camp_blemmye
-      structures/kush/camp_noba
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_melee_maceman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/kush/pyramid_large
-      structures/kush/temple_amun
-      structures/kush/camp_blemmye
-      structures/kush/camp_noba
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_pikeman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/kush/pyramid_large
-      structures/kush/temple_amun
-      structures/kush/camp_blemmye
-      structures/kush/camp_noba
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/kush/pyramid_large
-      structures/kush/temple_amun
-      structures/kush/camp_blemmye
-      structures/kush/camp_noba
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/kush/pyramid_large
-      structures/kush/temple_amun
-      structures/kush/camp_blemmye
-      structures/kush/camp_noba
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/kush/pyramid_large
-      structures/kush/temple_amun
-      structures/kush/camp_blemmye
-      structures/kush/camp_noba
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/maur/palace
-      structures/maur/pillar_ashoka
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>maur</Civ>
     <SelectionGroupName>units/maur/infantry_archer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/maur/palace
-      structures/maur/pillar_ashoka
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>maur</Civ>
     <SelectionGroupName>units/maur/infantry_spearman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
@@ -5,12 +5,6 @@
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
     </Melee>
   </Attack>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/maur/palace
-      structures/maur/pillar_ashoka
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>maur</Civ>
     <SelectionGroupName>units/maur/infantry_swordsman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/maur/palace
-      structures/maur/pillar_ashoka
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Naari</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/pers/apadana
-      structures/pers/ice_house
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/pers/apadana
-      structures/pers/ice_house
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/pers/apadana
-      structures/pers/ice_house
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/pers/apadana
-      structures/pers/ice_house
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol/lighthouse
-      structures/ptol/library
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_archer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol/lighthouse
-      structures/ptol/library
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_javelineer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_pikeman_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_pikeman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol/lighthouse
-      structures/ptol/library
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_pikeman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol/lighthouse
-      structures/ptol/library
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_slinger_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|hoplite|template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol/lighthouse
-      structures/ptol/library
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SelectionGroupName>units/ptol/infantry_spearman_merc_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol/lighthouse
-      structures/ptol/library
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/ptol/lighthouse
-      structures/ptol/library
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Gýnē Aigýptia</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/rome/army_camp
-      structures/rome/temple_vesta
-    </Entities>
-  </Builder>
   <Cost>
     <Resources>
       <food op="add">-10</food>
Index: binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/rome/army_camp
-      structures/rome/temple_vesta
-    </Entities>
-  </Builder>
   <Cost>
     <Resources>
       <food op="add">-10</food>
Index: binaries/data/mods/public/simulation/templates/units/rome/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/infantry_javelineer_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/rome/army_camp
-      structures/rome/temple_vesta
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
Index: binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/rome/army_camp
-      structures/rome/temple_vesta
-    </Entities>
-  </Builder>
   <Health>
     <DamageVariants>
       <lightdamage>0.85</lightdamage>
Index: binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_b.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/rome/army_camp
-      structures/rome/temple_vesta
-    </Entities>
-  </Builder>
   <Health>
     <DamageVariants>
       <lightdamage>0.85</lightdamage>
Index: binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_slave.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_slave.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/infantry_swordsman_slave.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/rome/army_camp
-      structures/rome/temple_vesta
-    </Entities>
-  </Builder>
   <Health>
     <DamageVariants>
       <lightdamage>0.85</lightdamage>
Index: binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/rome/army_camp
-      structures/rome/temple_vesta
-    </Entities>
-  </Builder>
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
Index: binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/spart/syssiton
       -structures/{civ}/wallset_stone
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
-      structures/spart/syssiton
       -structures/{civ}/wallset_stone
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="hoplite|template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/spart/syssiton
       -structures/{civ}/wallset_stone
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml
@@ -9,7 +9,6 @@
   </Attack>
   <Builder>
     <Entities datatype="tokens">
-      structures/spart/syssiton
       -structures/{civ}/wallset_stone
     </Entities>
   </Builder>