diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
index a3f55fe2fd..6f88700d9a 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
@@ -7,20 +7,17 @@
     <variant frequency="100" name="Base">
       <animations>
 		<!-- Class Specific -->
-	    <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-		<!-- Stamina Specific -->
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-		<!-- Citzen Soldier Specific -->
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
@@ -28,7 +25,6 @@
         <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>	
       <mesh>skeletal/m_pants_b.pmd</mesh>
       <props>
@@ -83,7 +79,7 @@
         <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
index 5ef7f8ddb9..a7cf819c89 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
@@ -6,21 +6,17 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-		<!-- Class Specific -->
-	    <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-		<!-- Stamina Specific -->
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-		<!-- Citzen Soldier Specific -->
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
@@ -28,7 +24,6 @@
         <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>	
       <mesh>skeletal/m_pants_b.pmd</mesh>
       <props>
@@ -49,7 +44,7 @@
         <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
index b0722e0fa6..53a9288075 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
@@ -6,21 +6,17 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-		<!-- Class Specific -->
-	    <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-		<!-- Stamina Specific -->
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-		<!-- Citzen Soldier Specific -->
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
         <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
@@ -28,7 +24,6 @@
         <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>	
       <mesh>skeletal/m_tights.pmd</mesh>
       <props>
@@ -58,7 +53,7 @@
         <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
index 6772bab3fd..c1767ddfef 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_a.xml
@@ -6,29 +6,24 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-		<!-- Class Specific -->
-	    <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-		<!-- Stamina Specific -->
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
-        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-		<!-- Citzen Soldier Specific -->
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
       </animations>	
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
@@ -50,10 +45,10 @@
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
       <props>
-        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
index 3eba68d8be..78f8da57f2 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_b.xml
@@ -7,7 +7,7 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
@@ -24,12 +24,12 @@
         <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
         <prop actor="props/units/heads/thrac_a.xml" attachpoint="head"/>
         <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+		<prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
       </props>
       <texture>skeletal/hele_ijv_b.dds</texture>
@@ -43,7 +43,7 @@
         <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
index 9baa964a92..12d5c94923 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/infantry_javelinist_e.xml
@@ -6,29 +6,24 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-		<!-- Class Specific -->
-	    <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
-		<!-- Stamina Specific -->
-        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
-        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
-        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
-		<!-- Citzen Soldier Specific -->
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-		<!-- Shared  -->
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
       </animations>	
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
@@ -51,10 +46,10 @@
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
       <props>
-        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
       </props>
     </variant>