diff --git a/src/DataValue.cs b/src/DataValue.cs
index 77ac9d9..f0a0eb8 100644
--- a/src/DataValue.cs
+++ b/src/DataValue.cs
@@ -11,8 +11,6 @@ using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Timers;
 
 [assembly: Addin("DataValueModule", "0.1")]
@@ -146,7 +144,7 @@ namespace OpenSim.Modules.DataValue
 
         public void RemoveRegion(Scene scene)
         {
-
+            m_timer.Stop();
         }
 
         #endregion
@@ -160,10 +158,10 @@ namespace OpenSim.Modules.DataValue
             if (m_enabledRateLimit)
             {
                 if (m_rateLimit >= 100)
-                    Thread.Sleep(300);
+                    System.Threading.Thread.Sleep(300);
 
                 if (m_rateLimit >= 200)
-                    Thread.Sleep(600);
+                    System.Threading.Thread.Sleep(600);
             }
         }