diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 3584cda015..29fb0fef30 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -524,11 +524,5 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             SendAnimPack(animIDs, sequenceNums, objectIDs);
         }
-
-        public void Close()
-        {
-            m_animations = null;
-            m_scenePresence = null;
-        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0f49fefc5c..ef15f74842 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -102,15 +102,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         public UUID currentParcelUUID = UUID.Zero;
 
-        protected ScenePresenceAnimator m_animator;
         /// <value>
         /// The animator for this avatar
         /// </value>
-        public ScenePresenceAnimator Animator
-        {
-            get { return m_animator; }
-            private set { m_animator = value; }
-        }
+        public ScenePresenceAnimator Animator { get; private set; }
 
         /// <summary>
         /// Attachments recorded on this avatar.
@@ -2631,8 +2626,7 @@ namespace OpenSim.Region.Framework.Scenes
             //m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
 
             avatar.ControllingClient.SendAvatarDataImmediate(this);
-            if (Animator != null)
-                Animator.SendAnimPackToClient(avatar.ControllingClient);
+            Animator.SendAnimPackToClient(avatar.ControllingClient);
         }
 
         /// <summary>
@@ -3300,14 +3294,12 @@ namespace OpenSim.Region.Framework.Scenes
             //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
             // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents(
             // as of this comment the interval is set in AddToPhysicalScene
-            if (Animator != null)
-            {
+
 //                if (m_updateCount > 0)
 //                {
-                    Animator.UpdateMovementAnimations();
+            Animator.UpdateMovementAnimations();
 //                    m_updateCount--;
 //                }
-            }
 
             CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
             Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
@@ -3322,7 +3314,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                m_lastColCount = coldata.Count;
 //            }
 
-            if (coldata.Count != 0 && Animator != null)
+            if (coldata.Count != 0)
             {
                 switch (Animator.CurrentMovementAnimation)
                 {
@@ -3393,7 +3385,7 @@ namespace OpenSim.Region.Framework.Scenes
             ControllingClient.SendHealth(Health);
         }
 
-        public void Close()
+        protected internal void Close()
         {
             // Clear known regions
             KnownRegions = new Dictionary<ulong, string>();
@@ -3409,8 +3401,6 @@ namespace OpenSim.Region.Framework.Scenes
             // m_reprioritizationTimer.Dispose(); 
 
             RemoveFromPhysicalScene();
-            Animator.Close();
-            Animator = null;
         }
 
         public void AddAttachment(SceneObjectGroup gobj)