diff --git a/binaries/data/mods/public/gui/common/tooltips.js b/binaries/data/mods/public/gui/common/tooltips.js
index ada0ca7e40..74075b052d 100644
--- a/binaries/data/mods/public/gui/common/tooltips.js
+++ b/binaries/data/mods/public/gui/common/tooltips.js
@@ -6,7 +6,6 @@ const g_TooltipTextFormats = {
 };
 
 const g_AttackTypes = {
-	"Charge": translate("Charge Attack:"),
 	"Melee": translate("Melee Attack:"),
 	"Ranged": translate("Ranged Attack:"),
 	"Capture": translate("Capture Attack:")
@@ -144,8 +143,6 @@ function getAttackTooltip(template)
 	{
 		if (type == "Slaughter")
 			continue; // Slaughter is used to kill animals, so do not show it.
-		if (type == "Charge")
-			continue; // Charging isn't implemented yet and shouldn't be displayed.
 
 		let rate = sprintf(translate("%(label)s %(details)s"), {
 			"label":
diff --git a/binaries/data/mods/public/gui/text/tips/spearmen.txt b/binaries/data/mods/public/gui/text/tips/spearmen.txt
index 8df330a67a..1622c4bdc2 100644
--- a/binaries/data/mods/public/gui/text/tips/spearmen.txt
+++ b/binaries/data/mods/public/gui/text/tips/spearmen.txt
@@ -1,8 +1,8 @@
 SPEARMEN
 - The basic melee infantry for every faction in the game.
 
-- Used against cavalry for a 2x attack bonus.
+- Used against cavalry for an attack bonus.
 
-- Decent hack attack and a good charge bonus make them good front line troops.
+- Decent hack attack make them good front line troops.
 
-- They are countered by ranged units and swordsmen, so support your spearmen with slingers or cavalry.
\ No newline at end of file
+- They are countered by ranged units and swordsmen, so support your spearmen with slingers or cavalry.
diff --git a/binaries/data/mods/public/simulation/ai/petra/entityExtend.js b/binaries/data/mods/public/simulation/ai/petra/entityExtend.js
index ec1b258584..6b9e6c82df 100644
--- a/binaries/data/mods/public/simulation/ai/petra/entityExtend.js
+++ b/binaries/data/mods/public/simulation/ai/petra/entityExtend.js
@@ -11,7 +11,7 @@ m.getMaxStrength = function(ent, againstClass)
 
 	for (let type of attackTypes)
 	{
-		if (type == "Slaughter" || type == "Charge")
+		if (type == "Slaughter")
 			continue;
 
 		let attackStrength = ent.attackStrengths(type);
diff --git a/binaries/data/mods/public/simulation/components/Attack.js b/binaries/data/mods/public/simulation/components/Attack.js
index 31e81e6c02..74f54bfd19 100644
--- a/binaries/data/mods/public/simulation/components/Attack.js
+++ b/binaries/data/mods/public/simulation/components/Attack.js
@@ -88,13 +88,6 @@ Attack.prototype.Schema =
 				"<Crush>0.0</Crush>" +
 			"</Splash>" +
 		"</Ranged>" +
-		"<Charge>" +
-			"<Hack>10.0</Hack>" +
-			"<Pierce>0.0</Pierce>" +
-			"<Crush>50.0</Crush>" +
-			"<MaxRange>24.0</MaxRange>" +
-			"<MinRange>20.0</MinRange>" +
-		"</Charge>" +
 		"<Slaughter>" +
 			"<Hack>1000.0</Hack>" +
 			"<Pierce>0.0</Pierce>" +
@@ -172,20 +165,6 @@ Attack.prototype.Schema =
 			"</interleave>" +
 		"</element>" +
 	"</optional>" +
-	"<optional>" +
-		"<element name='Charge'>" +
-			"<interleave>" +
-				"<element name='Hack' a:help='Hack damage strength'><ref name='nonNegativeDecimal'/></element>" +
-				"<element name='Pierce' a:help='Pierce damage strength'><ref name='nonNegativeDecimal'/></element>" +
-				"<element name='Crush' a:help='Crush damage strength'><ref name='nonNegativeDecimal'/></element>" +
-				"<element name='MaxRange'><ref name='nonNegativeDecimal'/></element>" + // TODO: how do these work?
-				"<element name='MinRange'><ref name='nonNegativeDecimal'/></element>" +
-				Attack.prototype.bonusesSchema +
-				Attack.prototype.preferredClassesSchema +
-				Attack.prototype.restrictedClassesSchema +
-			"</interleave>" +
-		"</element>" +
-	"</optional>" +
 	"<optional>" +
 		"<element name='Slaughter' a:help='A special attack to kill domestic animals'>" +
 			"<interleave>" +
@@ -375,7 +354,7 @@ Attack.prototype.GetTimers = function(type)
 	let repeat = +(this.template[type].RepeatTime || 1000);
 	repeat = ApplyValueModificationsToEntity("Attack/" + type + "/RepeatTime", repeat, this.entity);
 
-	return { "prepare": prepare, "repeat": repeat, "recharge": repeat - prepare };
+	return { "prepare": prepare, "repeat": repeat };
 };
 
 Attack.prototype.GetAttackStrengths = function(type)
@@ -596,7 +575,6 @@ Attack.prototype.PerformAttack = function(type, target)
 			"type":type
 		});
 	}
-	// TODO: charge attacks (need to design how they work)
 };
 
 Attack.prototype.InterpolatedLocation = function(ent, lateness)
diff --git a/binaries/data/mods/public/simulation/components/tests/test_Attack.js b/binaries/data/mods/public/simulation/components/tests/test_Attack.js
index dd09ea97ea..455ce1a46b 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_Attack.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_Attack.js
@@ -112,14 +112,12 @@ attackComponentTest(undefined, (attacker, cmpAttack, defender) => {
 
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetTimers("Ranged"), {
 		"prepare": 300,
-		"repeat": 500,
-		"recharge": 200
+		"repeat": 500
 	});
 
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetTimers("Capture"), {
 		"prepare": 0,
-		"repeat": 1000,
-		"recharge": 1000
+		"repeat": 1000
 	});
 });
 
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
index 2f8d7c80d4..7258b8f153 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
@@ -19,19 +19,6 @@
         </BonusCav>
       </Bonuses>
     </Melee>
-    <Charge>
-      <Hack>30.0</Hack>
-      <Pierce>30.0</Pierce>
-      <Crush>30.0</Crush>
-      <MaxRange>6.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <Bonuses>
-        <BonusCav>
-          <Classes>Cavalry</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusCav>
-      </Bonuses>
-    </Charge>
   </Attack>
   <Footprint>
     <Square width="4.6" depth="9.2"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
index 151985c3ce..434f5d0ed9 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
@@ -19,19 +19,6 @@
         </BonusCav>
       </Bonuses>
     </Melee>
-    <Charge>
-      <Hack>28.0</Hack>
-      <Pierce>28.0</Pierce>
-      <Crush>28.0</Crush>
-      <MaxRange>6.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <Bonuses>
-        <BonusCav>
-          <Classes>Cavalry</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusCav>
-      </Bonuses>
-    </Charge>
   </Attack>
   <Footprint>
     <Square width="4.0" depth="8.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
index cb20f9b270..98d4353a13 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
@@ -13,14 +13,6 @@
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
-    <Charge>
-      <Hack>30.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
-    </Charge>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee</VisibleClasses>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
index a469051afc..1594f365bf 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -6,10 +6,6 @@
       <Pierce>13.0</Pierce>
       <RepeatTime>3500</RepeatTime>
     </Melee>
-    <Charge>
-      <Hack>10.0</Hack>
-      <Pierce>80.0</Pierce>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
index 87109c9325..fdc371fea0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -11,13 +11,6 @@
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
     </Melee>
-    <Charge>
-      <Hack>16.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>6.0</MaxRange>
-      <MinRange>0.0</MinRange>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
index 6de8c069c9..705861fa79 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -12,13 +12,6 @@
       <MaxRange>5.0</MaxRange>
       <RepeatTime>3500</RepeatTime>
     </Melee>
-    <Charge>
-      <Hack>7.5</Hack>
-      <Pierce>120.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-      <MinRange>0.0</MinRange>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
index 43e6c15a30..5d8d047cd9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -13,14 +13,6 @@
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
-    <Charge>
-      <Hack>60.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
index e734460e62..9dfec14942 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
@@ -8,13 +8,6 @@
       <MaxRange>8.0</MaxRange>
       <RepeatTime>1500</RepeatTime>
     </Melee>
-    <Charge>
-      <Hack>40.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>300.0</Crush>
-      <MaxRange>8.0</MaxRange>
-      <MinRange>0.0</MinRange>
-    </Charge>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee</VisibleClasses>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
index 79359f163b..c80f7b8947 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -19,19 +19,6 @@
           </BonusCavMelee>
       </Bonuses>
     </Melee>
-    <Charge>
-      <Hack>6.0</Hack>
-      <Pierce>24.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>8.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <Bonuses>
-          <BonusCavMelee>
-            <Classes>Cavalry</Classes>
-            <Multiplier>3.0</Multiplier>
-          </BonusCavMelee>
-      </Bonuses>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
index 1be255eed0..4837adbef8 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -18,19 +18,6 @@
           </BonusCavMelee>
       </Bonuses>
     </Melee>
-    <Charge>
-      <Hack>15.0</Hack>
-      <Pierce>40.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <Bonuses>
-          <BonusCavMelee>
-            <Classes>Cavalry</Classes>
-            <Multiplier>3.0</Multiplier>
-          </BonusCavMelee>
-      </Bonuses>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
index 31f0cccc2f..b081fbc53d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -12,13 +12,6 @@
       <MaxRange>5.0</MaxRange>
       <RepeatTime>750</RepeatTime>
     </Melee>
-    <Charge>
-      <Hack>18.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>5.0</MaxRange>
-      <MinRange>0.0</MinRange>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
index 908ebda4bf..fec6b40765 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -20,14 +20,6 @@
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure</RestrictedClasses>
     </Melee>
-    <Charge>
-      <Hack>20.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>3.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <RestrictedClasses datatype="tokens">Structure</RestrictedClasses>
-    </Charge>
   </Attack>
   <Cost>
     <BuildTime>12</BuildTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
index d9219a2836..15bcd7e45e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
@@ -9,14 +9,6 @@
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
-    <Charge>
-      <Hack>2.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Charge>
   </Attack>
   <Health>
     <Max>100</Max>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
index aec8a3782e..1970eee86d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -17,17 +17,6 @@
           </BonusCavMelee>
       </Bonuses>
     </Melee>
-    <Charge>
-      <Hack>8.0</Hack>
-      <Pierce>16.0</Pierce>
-      <MaxRange>8.0</MaxRange>
-      <Bonuses>
-          <BonusCavMelee>
-            <Classes>Cavalry</Classes>
-            <Multiplier>3.0</Multiplier>
-          </BonusCavMelee>
-      </Bonuses>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
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 4ebb215dd7..82fed5dba3 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
@@ -15,16 +15,6 @@
         </BonusCavMelee>
       </Bonuses>
     </Melee>
-    <Charge>
-      <Hack>12.0</Hack>
-      <Pierce>24.0</Pierce>
-      <Bonuses>
-        <BonusCavMelee>
-          <Classes>Cavalry</Classes>
-          <Multiplier>3.0</Multiplier>
-        </BonusCavMelee>
-      </Bonuses>
-    </Charge>
   </Attack>
   <Cost>
     <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 aa5e4503bd..f3c9abcbbe 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
@@ -11,9 +11,6 @@
       <MaxRange>2.0</MaxRange>
       <RepeatTime>750</RepeatTime>
     </Melee>
-    <Charge>
-      <Hack>12.0</Hack>
-    </Charge>
   </Attack>
   <Cost>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
index e654202b66..07fca2d87f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
@@ -8,13 +8,6 @@
       <MaxRange>8.0</MaxRange>
       <RepeatTime>100</RepeatTime>
     </Melee>
-    <Charge>
-      <Hack>15.0</Hack>
-      <Pierce>15.0</Pierce>
-      <Crush>15.0</Crush>
-      <MaxRange>8.0</MaxRange>
-      <MinRange>0.0</MinRange>
-    </Charge>
   </Attack>
   <Cost>
     <BuildTime>20</BuildTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
index 1b2ab7c197..bbb3df7d85 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
@@ -14,14 +14,6 @@
       <RepeatTime>1500</RepeatTime>
       <PreferredClasses datatype="tokens">Gates Structure</PreferredClasses>
     </Melee>
-    <Charge>
-      <Hack>0.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>160.0</Crush>
-      <MaxRange>6.5</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PreferredClasses datatype="tokens">Gates Structure</PreferredClasses>
-    </Charge>
   </Attack>
   <Capturable disable=""/>
   <Cost>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
index ce0ad255b6..0882914d04 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
@@ -4,9 +4,6 @@
     <Melee>
       <MaxRange>6.0</MaxRange>
     </Melee>
-    <Charge>
-      <MaxRange>6.0</MaxRange>
-    </Charge>
   </Attack>
   <Builder>
     <Entities datatype="tokens">
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
index d5a8a4017c..313e9b6e18 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
@@ -9,10 +9,6 @@
       <Hack>0</Hack>
       <Crush>10.5</Crush>
     </Melee>
-    <Charge>
-      <Hack>0.0</Hack>
-      <Crush>21.0</Crush>
-    </Charge>
   </Attack>
   <Identity>
     <Civ>maur</Civ>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_mechanical_siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/pers_mechanical_siege_ram.xml
index ab6c12ef19..542a1bd984 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_mechanical_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_mechanical_siege_ram.xml
@@ -4,9 +4,6 @@
     <Melee>
       <Crush op="mul">1.2</Crush>
     </Melee>
-    <Charge>
-      <Crush op="mul">1.2</Crush>
-    </Charge>
   </Attack>
   <Footprint replace="">
     <Square width="7.0" depth="15.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml b/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
index fff6c0fa27..a133ae4ec8 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
@@ -4,9 +4,6 @@
     <Melee>
       <Hack>20</Hack>
     </Melee>
-    <Charge>
-      <Hack>40.0</Hack>
-    </Charge>
   </Attack>
   <Health>
     <Max>140</Max>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
index a05626e61d..577a0dbd9d 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
@@ -4,9 +4,6 @@
     <Melee>
       <Hack>18.5</Hack>
     </Melee>
-    <Charge>
-      <Hack>36.0</Hack>
-    </Charge>
   </Attack>
   <Identity>
     <Civ>rome</Civ>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ram.xml b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ram.xml
index 7108966f65..f0a1239d89 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ram.xml
@@ -4,9 +4,6 @@
     <Melee>
       <Crush op="mul">1.2</Crush>
     </Melee>
-    <Charge>
-      <Crush op="mul">1.2</Crush>
-    </Charge>
   </Attack>
   <Footprint replace="">
     <Square width="8.0" depth="12.0"/>
diff --git a/binaries/data/tools/atlas/lists.xml b/binaries/data/tools/atlas/lists.xml
index 3ed4fec1ea..078a425092 100644
--- a/binaries/data/tools/atlas/lists.xml
+++ b/binaries/data/tools/atlas/lists.xml
@@ -38,7 +38,6 @@
     <item>attack_melee    </item>
     <item>attack_ranged   </item>
     <item>attack_capture   </item>
-    <item>attack_charge   </item>
     <item>attack_slaughter</item>
     <item>death           </item>
     <item>build           </item>
diff --git a/source/simulation2/components/CCmpUnitMotion.cpp b/source/simulation2/components/CCmpUnitMotion.cpp
index 96d14c6dfe..741c7497a6 100644
--- a/source/simulation2/components/CCmpUnitMotion.cpp
+++ b/source/simulation2/components/CCmpUnitMotion.cpp
@@ -274,10 +274,6 @@ public:
 			"</element>";
 	}
 
-	/*
-	 * TODO: the running/charging thing needs to be designed and implemented
-	 */
-
 	virtual void Init(const CParamNode& paramNode)
 	{
 		m_FormationController = paramNode.GetChild("FormationController").ToBool();
@@ -859,7 +855,6 @@ void CCmpUnitMotion::Move(fixed dt)
 		CFixedVector2D pos = initialPos;
 
 		// If in formation, run to keep up; otherwise just walk
-		// (TODO: support stamina, charging, etc)
 		fixed basicSpeed;
 		if (IsFormationMember())
 			basicSpeed = GetRunSpeed();