Index: binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
+++ binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
@@ -1,21 +1,22 @@
 {
 	"autoResearch": true,
 	"icon": "coins.png",
-	"tooltip": "Non-Champion Mercenaries −60% food cost, no wood or stone costs, −30% training time, and unable to gather resources; Infantry costs 60 metal, Cavalry 80 metal, Elephants 120 metal.",
+	"tooltip": "Non-Champion Mercenaries start at Advanced rank and have no food, wood, or stone costs, have −50% training time, and are unable to gather resources; Infantry costs 60 metal, Cavalry 80 metal, Elephants 120 metal.",
 	"modifications": [
-		{ "value": "Cost/BuildTime", "multiply": 0.7 },
-		{ "value": "Cost/Resources/food", "multiply": 0.4 },
+		{ "value": "Cost/BuildTime", "multiply": 0.5 },
+		{ "value": "Cost/Resources/food", "replace": 0 },
 		{ "value": "Cost/Resources/wood", "replace": 0 },
 		{ "value": "Cost/Resources/stone", "replace": 0 },
 		{ "value": "Cost/Resources/metal", "replace": 60, "affects": "Infantry" },
 		{ "value": "Cost/Resources/metal", "replace": 80, "affects": "Cavalry" },
 		{ "value": "Cost/Resources/metal", "replace": 120, "affects": "Elephant" },
-		{ "value": "Loot/food", "multiply": 0.4 },
+		{ "value": "Loot/food", "replace": 0 },
 		{ "value": "Loot/wood", "replace": 0 },
 		{ "value": "Loot/stone", "replace": 0 },
 		{ "value": "Loot/metal", "replace": 6, "affects": "Infantry" },
 		{ "value": "Loot/metal", "replace": 8, "affects": "Cavalry" },
 		{ "value": "Loot/metal", "replace": 12, "affects": "Elephant" },
+		{ "value": "Promotion/RequiredXp", "replace": 0, "affects": "Basic" },
 		{ "value": "ResourceGatherer/BaseSpeed", "replace": 0 }
 	],
 	"affects": ["Mercenary !Champion"]
Index: binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"genericName": "Expertise In War",
-	"description": "Hire professional mercenaries to fight in your army.",
-	"cost": {
-		"metal": 600
-	},
-	"requirements": {
-		"all": [
-			{ "tech": "phase_town" },
-			{
-				"any": [
-					{ "civ": "athen" },
-					{ "civ": "cart" },
-					{ "civ": "kush" },
-					{ "civ": "mace" },
-					{ "civ": "ptol" },
-					{ "civ": "sele" }
-				]
-			}
-		]
-	},
-	"requirementsTooltip": "Unlocked in Town Phase.",
-	"icon": "upgrade_advanced.png",
-	"researchTime": 40,
-	"tooltip": "Mercenaries are promoted to Advanced rank.",
-	"modifications": [
-		{ "value": "Promotion/RequiredXp", "replace": 0, "affects": "Basic" }
-	],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml",
-	"affects": ["Mercenary"]
-}
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
@@ -14,11 +14,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/mace/barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace/barracks.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace/barracks.xml
@@ -14,11 +14,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/macedonians/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -40,7 +40,6 @@
       -phase_town_{civ}
       -phase_city_{civ}
       -hellenistic_metropolis
-      upgrade_rank_advanced_mercenary
     </Technologies>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -29,9 +29,6 @@
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
   </ProductionQueue>
   <Resistance>
     <Entity>