Index: binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
+++ binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
@@ -8,7 +8,7 @@
 		{ "value": "Armour/Pierce", "add": 1 },
 		{ "value": "Armour/Crush", "add": 1 },
 		{ "value": "Attack/Capture/Capture", "add": 0.4 },
-		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5 },
+		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5, "affects": "Infantry" },
 		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
 		{ "value": "UnitMotion/WalkSpeed", "add": 1, "affects": "Cavalry" },
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
Index: binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
+++ binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
@@ -8,7 +8,7 @@
 		{ "value": "Armour/Pierce", "add": 1 },
 		{ "value": "Armour/Crush", "add": 1 },
 		{ "value": "Attack/Capture/Capture", "add": 0.4 },
-		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5 },
+		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5, "affects": "Infantry" },
 		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
 		{ "value": "UnitMotion/WalkSpeed", "add": 1, "affects": "Cavalry" },
 		{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -57,19 +57,6 @@
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
-  <ResourceGatherer>
-    <MaxDistance>2.0</MaxDistance>
-    <BaseSpeed>1.0</BaseSpeed>
-    <Rates>
-      <food.meat>5</food.meat>
-    </Rates>
-    <Capacities>
-      <food>20</food>
-      <wood>20</wood>
-      <stone>20</stone>
-      <metal>20</metal>
-    </Capacities>
-  </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
Index: binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -48,7 +48,6 @@
   <Promotion>
     <Entity>units/maur_elephant_archer_a</Entity>
   </Promotion>
-  <ResourceGatherer disable=""/>
   <Selectable>
     <Overlay>
       <Texture>