diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 091baff5a2..17d0aff6fb 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -113,8 +113,6 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_velocity = value; }
         }
 
-        protected Vector3 m_rotationalvelocity;
-
         /// <summary>
         /// Creates a new Entity (should not occur on it's own)
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0faefebdf6..6dd396c0a0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -450,18 +450,20 @@ namespace OpenSim.Region.Framework.Scenes
             Dispose(false);
         }
 
-        private bool disposed = false;
         public void Dispose()
         {
             Dispose(true);
             GC.SuppressFinalize(this);
         }
 
+        private bool disposed = false;
         protected void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
             if (!disposed)
             {
+                disposed = true;
+                IsDeleted = true;
+
                 if (KeyframeMotion != null)
                 {
                     KeyframeMotion.Delete();
@@ -475,7 +477,6 @@ namespace OpenSim.Region.Framework.Scenes
                     m_inventory.Dispose();
                     m_inventory = null;
                 }
-                disposed = true;
             }
         }