Index: binaries/data/mods/public/gui/text/tips/stoa.txt
===================================================================
--- binaries/data/mods/public/gui/text/tips/stoa.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-STOA
-A special structure for  Athenians, Macedonians, and Spartans.
-Trains Heavy Skirmishers and Sword Infantry Champions.
-Grants +10 Population.
Index: binaries/data/mods/public/simulation/ai/petra/config.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/config.js
+++ binaries/data/mods/public/simulation/ai/petra/config.js
@@ -59,7 +59,6 @@
 		"athen": [
 			"structures/{civ}/gymnasium",
 			"structures/{civ}/prytaneion",
-			"structures/{civ}/royal_stoa",
 			"structures/{civ}/theater"
 		],
 		"brit": [],
@@ -89,8 +88,7 @@
 			"structures/{civ}/pillar_ashoka"
 		],
 		"pers": [
-			"structures/{civ}/apadana",
-			"structures/{civ}/hall"
+			"structures/{civ}/apadana"
 		],
 		"ptol": [
 			"structures/{civ}/library"
@@ -103,7 +101,6 @@
 			"structures/{civ}/library"
 		],
 		"spart": [
-			"structures/{civ}/royal_stoa",
 			"structures/{civ}/syssiton",
 			"structures/{civ}/theater"
 		]
Index: binaries/data/mods/public/simulation/templates/special/player/player.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/player/player.xml
+++ binaries/data/mods/public/simulation/templates/special/player/player.xml
@@ -29,7 +29,6 @@
       <Pillar>0</Pillar>
       <PyramidLarge>2</PyramidLarge>
       <PyramidSmall>4</PyramidSmall>
-      <Stoa>2</Stoa>
       <TempleOfAmun>1</TempleOfAmun>
       <TempleOfVesta>1</TempleOfVesta>
       <Theater>1</Theater>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <BuildRestrictions>
-    <Category>Stoa</Category>
-  </BuildRestrictions>
   <Cost>
-    <PopulationBonus>10</PopulationBonus>
     <BuildTime>150</BuildTime>
     <Resources>
       <stone>100</stone>
@@ -30,7 +26,7 @@
   <Identity>
     <GenericName>Stoa</GenericName>
     <SelectionGroupName>template_structure_civic_stoa</SelectionGroupName>
-    <Tooltip>Train Mercenary Champions.</Tooltip>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Town Stoa</VisibleClasses>
     <Icon>gaia/special_stoa.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
@@ -42,14 +38,6 @@
   <Obstruction>
     <Static width="28.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}/black_cloak
-      units/{civ}/thureophoros
-      units/{civ}/thorakites
-    </Entities>
-  </ProductionQueue>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
Index: binaries/data/mods/public/simulation/templates/units/athen/black_cloak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/black_cloak.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_black_cloak">
-  <Identity>
-    <Civ>athen</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
@@ -5,7 +5,6 @@
       structures/athen/gymnasium
       structures/athen/theater
       structures/athen/prytaneion
-      structures/athen/royal_stoa
     </Entities>
   </Builder>
   <Cost>
Index: binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
@@ -5,7 +5,6 @@
       structures/athen/gymnasium
       structures/athen/theater
       structures/athen/prytaneion
-      structures/athen/royal_stoa
     </Entities>
   </Builder>
   <Cost>
Index: binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml
@@ -5,7 +5,6 @@
       structures/athen/gymnasium
       structures/athen/theater
       structures/athen/prytaneion
-      structures/athen/royal_stoa
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml
@@ -5,7 +5,6 @@
       structures/athen/gymnasium
       structures/athen/theater
       structures/athen/prytaneion
-      structures/athen/royal_stoa
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml
@@ -5,7 +5,6 @@
       structures/athen/gymnasium
       structures/athen/theater
       structures/athen/prytaneion
-      structures/athen/royal_stoa
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/athen/thureophoros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/thureophoros.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>athen</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace/thorakites.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/thorakites.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thorakites">
-  <Identity>
-    <Civ>mace</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace/thureophoros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/thureophoros.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>mace</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -6,12 +6,11 @@
     </Melee>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
-    <SpecificName>Rhomphaiaphoros</SpecificName>
+    <SpecificName>Rhomphaiophoros</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -8,12 +8,11 @@
     </Melee>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Armored Swordsman</GenericName>
     <SpecificName>Thōrakitēs</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_thorakites.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Resistance>
     <Entity>
Index: binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
+++ binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelineer">
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Heavy Skirmisher</GenericName>
-    <SpecificName>Thyreophóros</SpecificName>
+    <SpecificName>Thyreophoros</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_thureophoros.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_c_thureophoros.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/spart/black_cloak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/black_cloak.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_black_cloak">
-  <Identity>
-    <Civ>spart</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_sword.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_sword.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_sword.xml
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/spart/syssiton
       structures/spart/theater
-      structures/spart/royal_stoa
       -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
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/spart/syssiton
       structures/spart/theater
-      structures/spart/royal_stoa
       -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
@@ -4,7 +4,6 @@
     <Entities datatype="tokens">
       structures/spart/syssiton
       structures/spart/theater
-      structures/spart/royal_stoa
       -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
@@ -11,7 +11,6 @@
     <Entities datatype="tokens">
       structures/spart/syssiton
       structures/spart/theater
-      structures/spart/royal_stoa
       -structures/{civ}/wallset_stone
     </Entities>
   </Builder>
Index: binaries/data/mods/public/simulation/templates/units/spart/thorakites.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/thorakites.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thorakites">
-  <Identity>
-    <Civ>spart</Civ>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart/thureophoros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/thureophoros.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/merc_thureophoros">
-  <Identity>
-    <Civ>spart</Civ>
-  </Identity>
-</Entity>