diff --git a/Source/Framework/Constants/Movement/MovementConst.cs b/Source/Framework/Constants/Movement/MovementConst.cs
index e7adb7664..146d95812 100644
--- a/Source/Framework/Constants/Movement/MovementConst.cs
+++ b/Source/Framework/Constants/Movement/MovementConst.cs
@@ -32,22 +32,20 @@ namespace Framework.Constants
         Waypoint = 2,                              // WaypointMovement
 
         MaxDB = 3,                              // *** this and below motion types can't be set in DB.
-        AnimalRandom = MaxDB,         // AnimalRandomMovementGenerator.h
-        Confused = 4,                              // ConfusedMovementGenerator.h
-        Chase = 5,                              // TargetedMovementGenerator.h
-        Home = 6,                              // HomeMovementGenerator.h
-        Flight = 7,                              // WaypointMovementGenerator.h
-        Point = 8,                              // PointMovementGenerator.h
-        Fleeing = 9,                              // FleeingMovementGenerator.h
-        Distract = 10,                             // IdleMovementGenerator.h
-        Assistance = 11,                             // PointMovementGenerator.h (first part of flee for assistance)
-        AssistanceDistract = 12,                   // IdleMovementGenerator.h (second part of flee for assistance)
-        TimedFleeing = 13,                         // FleeingMovementGenerator.h (alt.second part of flee for assistance)
+        Confused = 4,                              // ConfusedMovementGenerator
+        Chase = 5,                              // TargetedMovementGenerator
+        Home = 6,                              // HomeMovementGenerator
+        Flight = 7,                              // WaypointMovementGenerator
+        Point = 8,                              // PointMovementGenerator
+        Fleeing = 9,                              // FleeingMovementGenerator
+        Distract = 10,                             // IdleMovementGenerator
+        Assistance = 11,                             // PointMovementGenerator
+        AssistanceDistract = 12,                   // IdleMovementGenerator
+        TimedFleeing = 13,                         // FleeingMovementGenerator
         Follow = 14,
         Rotate = 15,
         Effect = 16,
-        Null = 17,
-        SplineChain = 18,
+        SplineChain = 17,
         Max
     }
 
diff --git a/Source/Game/Chat/Commands/MiscCommands.cs b/Source/Game/Chat/Commands/MiscCommands.cs
index 53a5bfe85..ea7d6b995 100644
--- a/Source/Game/Chat/Commands/MiscCommands.cs
+++ b/Source/Game/Chat/Commands/MiscCommands.cs
@@ -1865,9 +1865,6 @@ namespace Game.Chat
                     case MovementGeneratorType.Waypoint:
                         handler.SendSysMessage(CypherStrings.MovegensWaypoint);
                         break;
-                    case MovementGeneratorType.AnimalRandom:
-                        handler.SendSysMessage(CypherStrings.MovegensAnimalRandom);
-                        break;
                     case MovementGeneratorType.Confused:
                         handler.SendSysMessage(CypherStrings.MovegensConfused);
                         break;
diff --git a/Source/Game/Movement/MotionMaster.cs b/Source/Game/Movement/MotionMaster.cs
index 611923f01..571f4cf2b 100644
--- a/Source/Game/Movement/MotionMaster.cs
+++ b/Source/Game/Movement/MotionMaster.cs
@@ -149,7 +149,7 @@ namespace Game.Movement
         public MovementGeneratorType GetMotionSlotType(MovementSlot slot)
         {
             if (_slot[(int)slot] == null)
-                return MovementGeneratorType.Null;
+                return MovementGeneratorType.Max;
             else
                 return _slot[(int)slot].GetMovementGeneratorType();
         }