Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
@@ -17,28 +17,4 @@
   <VisualActor>
     <Actor>structures/hellenes/scout_tower.xml</Actor>
   </VisualActor>
-  <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
-  </Upgrade>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
@@ -18,28 +18,4 @@
     <FoundationActor>structures/carthaginians/fndn_defense_tower.xml</FoundationActor>
     <Actor>structures/carthaginians/scout_tower.xml</Actor>
   </VisualActor>
-  <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
-  </Upgrade>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
@@ -14,30 +14,6 @@
   <StatusBars>
     <HeightOffset>22.0</HeightOffset>
   </StatusBars>
-  <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
-  </Upgrade>
   <VisualActor>
     <Actor>structures/hellenes/scout_tower.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
@@ -7,18 +7,6 @@
   <StatusBars>
     <HeightOffset>19.0</HeightOffset>
   </StatusBars>
-  <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_double</Entity>
-      <Tooltip>Reinforce with stone block, and add a second rampart for up to 16 archers to stand upon. Infantry Archer exclusive tower. Devastating against melee troops, weak to siege and massed ranged units.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>70</stone>
-      </Cost>
-      <Time>200</Time>
-    </Tower1>
-  </Upgrade>
   <VisualActor>
     <Actor>structures/mauryas/scout_tower.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
@@ -17,28 +17,4 @@
   <VisualActor>
     <Actor>structures/ptolemies/defense_tower.xml</Actor>
   </VisualActor>
-  <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
-  </Upgrade>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
@@ -17,28 +17,4 @@
   <VisualActor>
     <Actor>structures/romans/scout_tower.xml</Actor>
   </VisualActor>
-  <Upgrade>
-    <Tower1>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small stone throwers to upgrade this defense tower into a slow, area of effect, and siege resistant artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower1>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install scorpions to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
-  </Upgrade>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
@@ -17,17 +17,4 @@
   <VisualActor>
     <Actor>structures/seleucids/scout_tower.xml</Actor>
   </VisualActor>
-  <Upgrade>
-    <Tower>
-      <Entity>structures/{civ}_tower_artillery</Entity>
-      <Tooltip>Reinforce with stone block, and install small torsion engines to upgrade this defense tower into an artillery tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <wood>150</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower>
-  </Upgrade>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
@@ -17,17 +17,4 @@
   <VisualActor>
     <Actor>structures/spartans/defense_tower.xml</Actor>
   </VisualActor>
-  <Upgrade>
-    <Tower2>
-      <Entity>structures/{civ}_tower_bolt</Entity>
-      <Tooltip>Reinforce with stone block, and install small oxybeles to upgrade this defense tower into a prompt, long range, and accurate bolt tower.</Tooltip>
-      <RequiredTechnology>phase_city</RequiredTechnology>
-      <Cost>
-        <metal>100</metal>
-        <stone>100</stone>
-      </Cost>
-      <Time>200</Time>
-      <Variant>upgrading</Variant>
-    </Tower2>
-  </Upgrade>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_tower_artillery
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_tower_artillery
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_tower_artillery
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman_hoplite">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_tower_artillery
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_tower_artillery
       structures/athen_gymnasium
       structures/athen_theater
       structures/athen_prytaneion
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_archer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
       structures/cart_super_dock
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/{civ}_tower_artillery
       structures/{civ}_super_dock
       structures/{civ}_embassy_celtic
       structures/{civ}_embassy_iberian
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/{civ}_tower_artillery
       structures/{civ}_super_dock
       structures/{civ}_embassy_celtic
       structures/{civ}_embassy_iberian
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman_hoplite">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
       structures/cart_super_dock
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/{civ}_tower_artillery
       structures/{civ}_super_dock
       structures/{civ}_embassy_celtic
       structures/{civ}_embassy_iberian
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/{civ}_tower_artillery
       structures/{civ}_super_dock
       structures/{civ}_embassy_celtic
       structures/{civ}_embassy_iberian
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
       structures/cart_super_dock
       structures/cart_embassy_celtic
       structures/cart_embassy_iberian
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_tower_artillery
       structures/mace_theater
       structures/mace_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_tower_artillery
       structures/mace_theater
       structures/mace_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_pikeman">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_tower_artillery
       structures/mace_theater
       structures/mace_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_tower_artillery
       structures/mace_theater
       structures/mace_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/mace_tower_artillery
       structures/mace_theater
       structures/mace_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/ptol_tower_artillery
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/ptol_tower_artillery
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_pikeman">
   <Builder>
     <Entities datatype="tokens">
-      structures/ptol_tower_artillery
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/ptol_tower_artillery
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman_hoplite">
   <Builder>
     <Entities datatype="tokens">
-      structures/ptol_tower_artillery
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/ptol_tower_artillery
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/ptol_tower_artillery
       structures/ptol_lighthouse
       structures/ptol_library
     </Entities>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_spear_gladiator.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_spear_gladiator.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_spear_gladiator.xml
@@ -5,7 +5,6 @@
   </Armour>
   <Builder>
     <Entities datatype="tokens">
-      structures/rome_tower_artillery
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_sword_gladiator.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_sword_gladiator.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_sword_gladiator.xml
@@ -6,7 +6,6 @@
   </Armour>
   <Builder>
     <Entities datatype="tokens">
-      structures/rome_tower_artillery
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/rome_tower_artillery
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/rome_tower_artillery
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/rome_tower_artillery
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_slave.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/rome_tower_artillery
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/rome_tower_artillery
       structures/rome_army_camp
       structures/rome_wallset_siege
       structures/rome_temple_vesta
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/sele_tower_artillery
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/sele_tower_artillery
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_pikeman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_pikeman">
   <Builder>
     <Entities datatype="tokens">
-      structures/sele_tower_artillery
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman_hoplite">
   <Builder>
     <Entities datatype="tokens">
-      structures/sele_tower_artillery
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/sele_tower_artillery
       structures/sele_library
     </Entities>
   </Builder>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/sele_tower_artillery
       structures/sele_library
     </Entities>
   </Builder>