Index: binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
+++ binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
@@ -1,5 +1,5 @@
 {
-	"genericName": "Unlock Champion Units",
+	"genericName": "Unlock Champion Infantry",
 	"specificName": {
 		"mace": "Ágēma",
 		"spart": "Ágēma",
@@ -7,23 +7,25 @@
 		"rome": "Regio Cohors"
 	},
 	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
-	"cost": { "food": 0, "wood": 0, "stone": 0, "metal": 1000 },
+	"cost": { "food": 0, "wood": 0, "stone": 0, "metal": 700 },
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
-			{ "any": [
-				{ "civ": "brit" },
-				{ "civ": "gaul" },
-				{ "civ": "iber" },
-				{ "civ": "mace" },
-				{ "civ": "maur" },
-				{ "civ": "rome" }
-			]}
+			{
+				"any": [
+					{ "civ": "brit" },
+					{ "civ": "gaul" },
+					{ "civ": "iber" },
+					{ "civ": "mace" },
+					{ "civ": "maur" },
+					{ "civ": "rome" }
+				]
+			}
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 90,
-	"tooltip": "Unlock the ability to train Champions at the Barracks.",
+	"tooltip": "Unlock Champion Infantry at the Barracks.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -20,7 +20,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_chariot
       units/{civ}_hero_boudicca
       units/{civ}_hero_caratacos
       units/{civ}_hero_cunobelin
Index: binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_temple.xml
@@ -12,7 +12,7 @@
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Maqdaš</SpecificName>
-    <Tooltip>Train Healers and Champions and research healing technologies. Garrison units to heal them at a quick rate.</Tooltip>
+    <Tooltip>Train Healers and Champion Infantry and research healing technologies. Garrison units to heal them at a quick rate.</Tooltip>
   </Identity>
   <Loot>
     <stone>80</stone>
@@ -23,7 +23,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/cart_tophet.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_tophet.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_tophet.xml
@@ -19,7 +19,6 @@
     <Civ>cart</Civ>
     <GenericName>Sacrificial Temple</GenericName>
     <SpecificName>Tophet</SpecificName>
-    <Tooltip>Train Healers and Champion Cavalry and research healing technologies. Garrison units to heal them at a quick rate.</Tooltip>
   </Identity>
   <Loot>
     <stone>40</stone>
@@ -28,11 +27,6 @@
   <Obstruction>
     <Static width="22.0" depth="24.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_cavalry
-    </Entities>
-  </ProductionQueue>
   <TerritoryDecay disable=""/>
   <Vision>
     <Range>40</Range>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_fortress.xml
@@ -10,7 +10,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
       units/{civ}_hero_brennus
       units/{civ}_hero_viridomarus
       units/{civ}_hero_vercingetorix
Index: binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_fortress.xml
@@ -23,7 +23,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
       units/{civ}_hero_caros
       units/{civ}_hero_indibil
       units/{civ}_hero_viriato
Index: binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_fortress.xml
@@ -14,7 +14,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
       units/{civ}_hero_nastasen
       units/{civ}_hero_amanirenas
Index: binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -14,7 +14,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_a
-      units/{civ}_champion_cavalry
       units/{civ}_hero_philip
       units/{civ}_hero_alexander
       units/{civ}_hero_demetrius
Index: binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -8,7 +8,6 @@
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
       units/{civ}_champion_maiden
-      units/{civ}_champion_chariot
       units/{civ}_hero_chanakya
       units/{civ}_hero_maurya
       units/{civ}_hero_ashoka
Index: binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -15,7 +15,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_pikeman
-      units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
     </Entities>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_fortress.xml
@@ -7,7 +7,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry
-      units/{civ}_champion_cavalry
       units/{civ}_hero_marcellus
       units/{civ}_hero_maximus
       units/{civ}_hero_scipio
Index: binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_fortress.xml
@@ -15,14 +15,11 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_champion_infantry_pikeman
-      units/{civ}_champion_chariot
       units/{civ}_champion_infantry_swordsman
-      units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
     </Entities>
     <Technologies datatype="tokens">
       successors/pair_unlock_champions
-      successors/special_war_horses
       successors/special_parade_of_daphne
     </Technologies>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -41,6 +41,7 @@
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
       units/{civ}_champion_cavalry
+      units/{civ}_champion_chariot
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
Index: binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -34,8 +34,6 @@
     </Entities>
     <Technologies datatype="tokens">
       gather_animals_stockbreeding
-      speed_cavalry_01
-      speed_cavalry_02
     </Technologies>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -37,6 +37,7 @@
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
+      structures/{civ}_stable
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
Index: binaries/data/mods/public/simulation/templates/units/brit_champion_chariot_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_champion_chariot_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit_champion_chariot">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
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
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
Index: binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
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
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
Index: binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>