Index: binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml
@@ -20,11 +20,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
@@ -17,15 +17,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/britons/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
@@ -17,15 +17,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/celts/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
@@ -10,15 +10,6 @@
     <Civ>iber</Civ>
     <SpecificName>Kaserna</SpecificName>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/barracks.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
@@ -21,13 +21,8 @@
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_a_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
     <Technologies datatype="tokens">
       upgrade_rank_advanced_mercenary
-      unlock_champion_units
     </Technologies>
   </ProductionQueue>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
@@ -13,12 +13,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
       units/{civ}_champion_maiden_barracks
     </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/mauryas/barracks.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_barracks.xml
@@ -12,6 +12,8 @@
       -units/{civ}_cavalry_spearman_b
       -units/{civ}_cavalry_javelinist_b
       -units/{civ}_cavalry_archer_b
+      -units/{civ}_champion_cavalry_barracks
+      -units/{civ}_champion_chariot_barracks
     </Entities>
     <Technologies datatype="tokens">
       persians/training_levy_infantry
Index: binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
@@ -20,15 +20,6 @@
   <Obstruction>
     <Static width="22.0" depth="22.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry_barracks
-      units/{civ}_champion_cavalry_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      unlock_champion_units
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -45,10 +45,14 @@
       units/{civ}_cavalry_spearman_b
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
+      units/{civ}_champion_infantry_barracks
+      units/{civ}_champion_cavalry_barracks
+      units/{civ}_champion_chariot_barracks
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
       training_conscription
+      unlock_champion_units
       archery_tradition
     </Technologies>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_a">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/mace_champion_infantry_e_barracks</Entity>
-  </Promotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_barracks.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_barracks.xml
@@ -3,7 +3,4 @@
   <Identity>
     <RequiredTechnology>unlock_champion_units</RequiredTechnology>
   </Identity>
-  <Promotion>
-    <Entity>units/mace_champion_infantry_e_barracks</Entity>
-  </Promotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_champion_infantry_e">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>