diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 7816860c63..d7cb7cf6c3 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -448,7 +448,7 @@ bool CharacterController::updateNpcState()
     if(!animPlaying)
     {
         if(mUpperBodyState == UpperCharState_EquipingWeap ||
-           mUpperBodyState == UpperCharState_LargeFollowStartToLargeFollowStop)
+           mUpperBodyState == UpperCharState_FollowStartToFollowStop)
             mUpperBodyState = UpperCharState_WeapEquiped;
         else if(mUpperBodyState == UpperCharState_UnEquipingWeap)
             mUpperBodyState = UpperCharState_Nothing;
@@ -480,12 +480,7 @@ bool CharacterController::updateNpcState()
                              MWRender::Animation::Group_UpperBody, true,
                              weapSpeed, mAttackType+" large follow start", mAttackType+" large follow stop",
                              0.0f, 0);
-            mUpperBodyState = UpperCharState_LargeFollowStartToLargeFollowStop;
-        }
-        else if(mUpperBodyState == UpperCharState_LargeFollowStartToLargeFollowStop)
-        {
-            mAnimation->disable(mCurrentWeapon);
-            mUpperBodyState = UpperCharState_WeapEquiped;
+            mUpperBodyState = UpperCharState_FollowStartToFollowStop;
         }
     }
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index d30328682b..6af6c16cc9 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -104,11 +104,7 @@ enum UpperBodyCharacterState {
     UpperCharState_MinAttackToMaxAttack,
     UpperCharState_MaxAttackToMinHit,
     UpperCharState_MinHitToHit,
-    UpperCharState_LargeFollowStartToLargeFollowStop,
-    UpperCharState_MediumFollowStartToMediumFollowStop,
-    UpperCharState_SmallFollowStartToSmallFollowStop,
-    UpperCharState_EquipingSpell,
-    UpperCharState_UnEquipingSpell
+    UpperCharState_FollowStartToFollowStop
 };
 
 class CharacterController