diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 6b26320099..c37076e764 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -9,7 +9,7 @@
     <Req>600</Req>
   </Promotion>
   <Cost>
-    <BuildTime>18</BuildTime>
+    <BuildTime>9</BuildTime>
     <Resources>
       <food>50</food>
       <wood>0</wood>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index 465c3017e6..e32c80e76b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -6,7 +6,6 @@
     <Tooltip>Bonused vs. Cavalry Swordsmen and Cavalry Spearmen.</Tooltip>
   </Identity>
   <Cost>
-    <BuildTime>10</BuildTime>
     <Resources>
       <wood>50</wood>
     </Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index 21775680d7..79a1553201 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -6,7 +6,6 @@
     <Tooltip>Bonused vs. Infantry Spearman and Infantry Javelinist.</Tooltip>
   </Identity>
   <Cost>
-    <BuildTime>10</BuildTime>
     <Resources>
       <metal>50</metal>
     </Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry_spearman.xml
index 95680c5be0..cedd9bf8c6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry_spearman.xml
@@ -4,6 +4,7 @@
     <GenericName>Super Cavalry Spearman</GenericName>
   </Identity>
   <Cost>
+    <BuildTime>16</BuildTime>
     <Resources>
       <wood>80</wood>
     </Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_pikeman.xml
index 6fe1f18dfc..4fc85da100 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry_pikeman.xml
@@ -4,7 +4,6 @@
     <GenericName>Super Infantry Pikeman</GenericName>
   </Identity>
   <Cost>
-    <BuildTime>13</BuildTime>
     <Resources>
       <food>50</food>
       <wood>50</wood>
@@ -12,9 +11,6 @@
       <metal>50</metal>
     </Resources>
   </Cost>
-  <Health>
-    <Max>130</Max>
-  </Health>
   <Stamina>
     <Max>1200</Max>
   </Stamina>