* optimized usings.

383 files changed, 1314 insertions, 2150 deletions

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index bd98045..c988ad8 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -25,20 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
 using log4net;
-using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.RegionLoader.Filesystem;
 using OpenSim.Framework.RegionLoader.Web;
-
-using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
+using OpenSim.Region.CoreModules.Agent.AssetTransaction;
 using OpenSim.Region.CoreModules.Avatar.InstantMessage;
+using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
 using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
 using OpenSim.Region.CoreModules.Scripting.XMLRPC;
-using OpenSim.Region.CoreModules.Agent.AssetTransaction;
 
 namespace OpenSim.ApplicationPlugins.LoadRegions
 {
@@ -88,7 +87,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             if (!CheckRegionsForSanity(regionsToLoad))
             {
                 m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations");
-                System.Environment.Exit(1);
+                Environment.Exit(1);
             }
 
             for (int i = 0; i < regionsToLoad.Length; i++)
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 43ae818..d457d2b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -27,20 +27,20 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Reflection;
 using System.Timers;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Terrain;
-using System.Collections.Generic;
 
 namespace OpenSim.ApplicationPlugins.RemoteController
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
index f593349..7a7af31 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
     /// <summary>
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
index 997c2d3..b27f9c5 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
index 20e619a..2ce5166 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
@@ -26,17 +26,14 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
-using System.Text;
 using System.Security.Cryptography;
+using System.Text;
 using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using System.Collections.Specialized;
+using System.Xml;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenMetaverse;
-using System.Xml;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index bfa27c3..2ac1001 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -30,18 +30,17 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
+using log4net;
+using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Servers;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using Nini.Config;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
     public class Rest
     {
-        internal static readonly log4net.ILog Log =
-            log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        internal static readonly ILog Log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         internal static bool DEBUG = Log.IsDebugEnabled;
 
@@ -468,25 +467,25 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         public static void Dump(byte[] data)
         {
-            char[] buffer = new char[Rest.DumpLineSize];
+            char[] buffer = new char[DumpLineSize];
             int cc = 0;
 
             for (int i = 0; i < data.Length; i++)
             {
-                if (i % Rest.DumpLineSize == 0) Console.Write("\n{0}: ",i.ToString("d8"));
+                if (i % DumpLineSize == 0) Console.Write("\n{0}: ",i.ToString("d8"));
 
                 if (i % 4  == 0) Console.Write(" ");
 
                 Console.Write("{0}",data[i].ToString("x2"));
 
                 if (data[i] < 127 && data[i] > 31)
-                    buffer[i % Rest.DumpLineSize] = (char) data[i];
+                    buffer[i % DumpLineSize] = (char) data[i];
                 else
-                    buffer[i % Rest.DumpLineSize] = '.';
+                    buffer[i % DumpLineSize] = '.';
 
                 cc++;
 
-                if (i != 0 && (i + 1) % Rest.DumpLineSize == 0)
+                if (i != 0 && (i + 1) % DumpLineSize == 0)
                 {
                     Console.Write(" |"+(new String(buffer))+"|");
                     cc = 0;
@@ -497,11 +496,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
             if (cc != 0)
             {
-                for (int i = cc ; i < Rest.DumpLineSize; i++)
+                for (int i = cc ; i < DumpLineSize; i++)
                 {
                     if (i % 4  == 0) Console.Write(" ");
                     Console.Write("  ");
-                    buffer[i % Rest.DumpLineSize] = ' ';
+                    buffer[i % DumpLineSize] = ' ';
                 }
                 Console.WriteLine(" |"+(new String(buffer))+"|");
             }
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 0775007..667cf57 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -27,18 +27,10 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
 using System.Xml;
-using System.Drawing;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using Nini.Config;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
index 241bc90..2996030 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
@@ -25,17 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenMetaverse;
-using Nini.Config;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
 using System.Xml;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index c022e09..81801df 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -28,9 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.ApplicationPlugins.Rest;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index aa222bb..853b004 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -27,18 +27,18 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
 using System.IO;
 using System.Threading;
-using System.Xml;
-using System.Drawing;
 using System.Timers;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
+using System.Xml;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
-using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Servers;
+using Timer=System.Timers.Timer;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
@@ -1931,19 +1931,19 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                     switch (ic.xml.Name)
                     {
                         case "current":
-                            ic.CurrentPermissions  = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
+                            ic.CurrentPermissions  = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
                             break;
                         case "next":
-                            ic.NextPermissions     = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
+                            ic.NextPermissions     = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
                             break;
                         case "group":
-                            ic.GroupPermissions    = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
+                            ic.GroupPermissions    = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
                             break;
                         case "everyone":
-                            ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
+                            ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
                             break;
                         case "base":
-                            ic.BasePermissions     = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
+                            ic.BasePermissions     = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
                             break;
                         default:
                             Rest.Log.DebugFormat("{0} Permissions:  invalid attribute {1}:{2}",
@@ -2176,7 +2176,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             internal UserProfileData              userProfile = null;
             internal InventoryFolderBase                 root = null;
             internal bool                             timeout = false;
-            internal System.Timers.Timer             watchDog = new System.Timers.Timer();
+            internal Timer             watchDog = new Timer();
 
             internal InventoryRequestData(OSHttpRequest request, OSHttpResponse response, string prefix)
                 : base(request, response, prefix)
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
index b7c9027..1e87996 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
@@ -26,17 +26,10 @@
  * 
  */
 
-using OpenMetaverse;
-using Nini.Config;
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
-using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
index a3f1d14..8c3ef75 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
@@ -26,8 +26,6 @@
 * 
 */
 
-using System;
-
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
 
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
index 4a98834..c81cb9f 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
@@ -25,18 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenMetaverse;
-using Nini.Config;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Xml;
-using OpenSim.Framework;
+using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index 8537da5..959bae6e2 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -26,27 +26,12 @@
  */
 
 using System;
-using System.Threading;
-using System.Collections;
-using System.Collections.Generic;
 using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Timers;
-using System.Xml;
 using System.Xml.Serialization;
 using OpenMetaverse;
-using Mono.Addins;
-using Nwc.XmlRpc;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.ApplicationPlugins.Rest;
 
 namespace OpenSim.ApplicationPlugins.Rest.Regions
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
index ab7e1ec..aa93f28 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -26,27 +26,11 @@
  */
 
 using System;
-using System.Threading;
-using System.Collections;
-using System.Collections.Generic;
 using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Timers;
-using System.Xml;
-using System.Xml.Serialization;
 using OpenMetaverse;
-using Mono.Addins;
-using Nwc.XmlRpc;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.ApplicationPlugins.Rest;
 
 namespace OpenSim.ApplicationPlugins.Rest.Regions
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
index 80c2aa3..b3815fa 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
@@ -25,13 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenMetaverse;
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Xml.Serialization;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.ApplicationPlugins.Rest.Regions
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index 2d13b6b..fdfeb7d 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -26,25 +26,7 @@
  */
 
 using System;
-using System.Threading;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Timers;
-using System.Xml;
 using System.Xml.Serialization;
-using OpenMetaverse;
-using Nwc.XmlRpc;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.ApplicationPlugins.Rest;
 
 namespace OpenSim.ApplicationPlugins.Rest.Regions
 {
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index 58dd729..86de6de 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -26,22 +26,15 @@
  */
 
 using System;
-using System.Threading;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Reflection;
-using System.Timers;
 using System.Xml;
-using OpenMetaverse;
-using Nwc.XmlRpc;
+using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.ApplicationPlugins.Rest
 {
@@ -49,8 +42,8 @@ namespace OpenSim.ApplicationPlugins.Rest
     {
         #region properties
 
-        protected static readonly log4net.ILog  m_log =
-            log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        protected static readonly ILog  m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IConfig        _config;       // Configuration source: Rest Plugins
         private IConfig        _pluginConfig; // Configuration source: Plugin specific
@@ -65,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.Rest
         private string _godkey;
         private int    _reqk;
 
-        [ThreadStaticAttribute]
+        [ThreadStatic]
         private static string  _threadRequestID = String.Empty;
 
         /// <summary>
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs
index a93f89c..7f16a04 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -10,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("OpenSim.ApplicationPlugins.ScriptEngine")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
index bc07ca7..edec35f 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 using System;
-using System.Collections.Generic;
 using System.Reflection;
-using System.Text;
 using log4net;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs
index ae4e2f9..b4b5d5b 100644
--- a/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs
+++ b/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -24,8 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 
diff --git a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
index 9211747..f992c16 100644
--- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
+++ b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Data.SqlClient;
 using System.Data;
+using System.Data.SqlClient;
 
 namespace OpenSim.Data.MSSQL
 {
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 425e233..27deef7 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -28,8 +28,8 @@
 using System;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.MSSQL
@@ -71,7 +71,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="connectionString">connect string</param>
         override public void Initialise(string connectionString)
         {
-            TicksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
+            TicksToEpoch = new DateTime(1970, 1, 1).Ticks;
 
             if (!string.IsNullOrEmpty(connectionString))
             {
@@ -162,7 +162,7 @@ namespace OpenSim.Data.MSSQL
                     " VALUES " +
                     "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)"))
             {
-                int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
+                int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
                 command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID));
                 command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name));
                 command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description));
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 8fd47a0..815e7ff 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 7c7a886..eec2091 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 764b89d..f367d78 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 562fbad..c687c89 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -31,8 +31,8 @@ using System.Data;
 using System.Data.SqlClient;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 
 namespace OpenSim.Data.MSSQL
 {
@@ -219,7 +219,7 @@ namespace OpenSim.Data.MSSQL
             {
                 return value.ToString();
             }
-            if (valueType == typeof(OpenMetaverse.UUID))
+            if (valueType == typeof(UUID))
             {
                 return value.ToString();
             }
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs
index baa25d5..aea31c9 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -26,11 +26,9 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 using System.Reflection;
-using System.Text;
 
 namespace OpenSim.Data.MSSQL
 {
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index d77afc9..44b042e 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -32,8 +32,8 @@ using System.Data.SqlClient;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 4524736..453941f 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -31,8 +31,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index a9945b6..cbab546 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Data
 
     public class Migration
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private string _type;
         private DbConnection _conn;
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 823fa78..508e053 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -26,15 +26,13 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
-
 namespace OpenSim.Data.MySQL
 {
     /// <summary>
@@ -62,7 +60,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="connect">connect string</param>
         override public void Initialise(string connect)
         {
-            TicksToEpoch = new System.DateTime(1970,1,1).Ticks;
+            TicksToEpoch = new DateTime(1970,1,1).Ticks;
 
             // TODO: This will let you pass in the connect string in
             // the config, though someone will need to write that.
@@ -145,7 +143,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 asset.Metadata.Local = (bool)dbReader["local"];
                             }
-                            catch (System.InvalidCastException)
+                            catch (InvalidCastException)
                             {
                                 asset.Metadata.Local = false;
                             }
@@ -199,7 +197,7 @@ namespace OpenSim.Data.MySQL
                     using (cmd)
                     {
                         // create unix epoch time
-                        int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
+                        int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
                         cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
                         cmd.Parameters.AddWithValue("?name", asset.Metadata.Name);
                         cmd.Parameters.AddWithValue("?description", asset.Metadata.Description);
@@ -240,7 +238,7 @@ namespace OpenSim.Data.MySQL
                     using (cmd)
                     {
                         // create unix epoch time
-                        int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
+                        int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
                         cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
                         cmd.Parameters.AddWithValue("?access_time", now);
                         cmd.ExecuteNonQuery();
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index f811d84..5acbb9d 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -28,15 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Data.MySQL
 {
@@ -131,7 +128,7 @@ namespace OpenSim.Data.MySQL
                 cmd.Dispose();
             }
 
-            m_lastConnectionUse = System.DateTime.Now.Ticks;
+            m_lastConnectionUse = DateTime.Now.Ticks;
 
             m_log.DebugFormat(
                 "[REGION DB]: Connection wait timeout {0} seconds",
@@ -140,7 +137,7 @@ namespace OpenSim.Data.MySQL
 
         protected void CheckConnection()
         {
-            long timeNow = System.DateTime.Now.Ticks;
+            long timeNow = DateTime.Now.Ticks;
             if (timeNow - m_lastConnectionUse > m_waitTimeout ||
                     m_connection.State != ConnectionState.Open)
             {
@@ -185,7 +182,7 @@ namespace OpenSim.Data.MySQL
                         else
                             m_FieldMap[name].SetValue(es, false);
                     }
-                    else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
+                    else if (m_FieldMap[name].GetValue(es) is UUID)
                     {
                         UUID uuid = UUID.Zero;
 
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 437747b..5c00330 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -29,8 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
+using System.Threading;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.MySQL
@@ -78,7 +79,7 @@ namespace OpenSim.Data.MySQL
                 if (lockedCons > m_maxConnections)
                 {
                     lockedCons = 0;
-                    System.Threading.Thread.Sleep(1000); // Wait some time before searching them again.
+                    Thread.Sleep(1000); // Wait some time before searching them again.
                     m_log.Debug(
                         "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
                 }
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index efc781d..7d29061 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.MySQL
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index c02016c..13361af 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 using System;
-using System.Reflection;
 using System.Collections.Generic;
+using System.Reflection;
 using log4net;
 using OpenSim.Framework;
 
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index f16795e..3bb6857 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -26,14 +26,14 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.MySQL
@@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL
                 cmd.Dispose();
             }
 
-            m_lastConnectionUse = System.DateTime.Now.Ticks;
+            m_lastConnectionUse = DateTime.Now.Ticks;
 
             m_log.DebugFormat(
                 "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond);
@@ -161,7 +161,7 @@ namespace OpenSim.Data.MySQL
         {
             //m_log.Debug("[REGION DB]: Checking connection");
 
-            long timeNow = System.DateTime.Now.Ticks;
+            long timeNow = DateTime.Now.Ticks;
             if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open)
             {
                 m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting");
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index ab55ba5..4b07ed6 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -28,13 +28,13 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
 using System.IO;
 using System.Reflection;
 using System.Threading;
-using System.Drawing;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -89,7 +89,7 @@ namespace OpenSim.Data.MySQL
                 }
                 catch (Exception)
                 {
-                    System.Threading.Thread.Sleep(500);
+                    Thread.Sleep(500);
 
                     m_Connection.Close();
                     m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
                 }
                 catch (Exception)
                 {
-                    System.Threading.Thread.Sleep(500);
+                    Thread.Sleep(500);
 
                     m_Connection.Close();
                     m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index f6a9af3..0f167b2 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -31,8 +31,9 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
+using System.Threading;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.MySQL
@@ -93,7 +94,7 @@ namespace OpenSim.Data.MySQL
                 if (lockedCons > m_maxConnections)
                 {
                     lockedCons = 0;
-                    System.Threading.Thread.Sleep(1000); // Wait some time before searching them again.
+                    Thread.Sleep(1000); // Wait some time before searching them again.
                     m_log.Debug(
                         "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
                     m_log.Debug("Current connections-in-use dump:");
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index 0f7c9cd..d03e66c 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index bee3d04..f148385 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -63,7 +56,7 @@ namespace OpenSim.Data.MySQL.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index 4638bca..953294f 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
             }
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index 8c7d820..e03e38d 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -26,16 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -62,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index 71e73c2..5cce53b 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
index 8448dd7..b74617e 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/ColorUserType.cs b/OpenSim/Data/NHibernate/ColorUserType.cs
index 1ebd07c..955a442 100644
--- a/OpenSim/Data/NHibernate/ColorUserType.cs
+++ b/OpenSim/Data/NHibernate/ColorUserType.cs
@@ -27,12 +27,10 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
+using System.Drawing;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
-using System.Drawing;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
index 0cd5c6f..589d1e3 100644
--- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
+++ b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
@@ -27,10 +27,10 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
+using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
index a7781a3..5d62ef3 100644
--- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
@@ -27,10 +27,10 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
+using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
index 25a2bc6..75b522f 100644
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -27,10 +27,10 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
+using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index d0046c6..f4527bf 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -25,16 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
-using NHibernate;
+using OpenMetaverse;
 using OpenSim.Framework;
-using Environment=NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs
index 07d9ab5..836c99e 100644
--- a/OpenSim/Data/NHibernate/NHibernateGridData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -27,15 +27,14 @@
 
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using log4net;
 using System.Reflection;
-using OpenSim.Framework;
+using log4net;
 using NHibernate;
 using NHibernate.Criterion;
-using System.Collections;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.NHibernate
 {
@@ -93,7 +92,7 @@ namespace OpenSim.Data.NHibernate
             }
         }
 
-        public override bool AuthenticateSim(OpenMetaverse.UUID UUID, ulong regionHandle, string simrecvkey)
+        public override bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey)
         {
             bool throwHissyFit = false; // Should be true by 1.0
 
@@ -147,7 +146,7 @@ namespace OpenSim.Data.NHibernate
             return DataResponse.RESPONSE_ERROR;
         }
 
-        public override RegionProfileData GetProfileByUUID(OpenMetaverse.UUID UUID)
+        public override RegionProfileData GetProfileByUUID(UUID UUID)
         {
             return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID);
         }
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index e648396..0129800 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -27,15 +27,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using OpenMetaverse;
 using OpenSim.Framework;
-using Environment=NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index 5e5eb47..51467da 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -26,14 +26,14 @@
  */
 
 using System;
+using System.Data.Common;
 using System.Reflection;
-using System.IO;
 using log4net;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
 using OpenMetaverse;
-using Environment = NHibernate.Cfg.Environment;
+using Environment=NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
 {
@@ -92,7 +92,7 @@ namespace OpenSim.Data.NHibernate
                 migrationSubType = "MySQLDialect";
             }
 
-            Migration migration = new Migration((System.Data.Common.DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
+            Migration migration = new Migration((DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
             migration.Update();
         }
 
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 29f4106..0cd3969 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -26,19 +26,15 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using Environment = NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index c739c86..7dfdcb5 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -25,17 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using OpenMetaverse;
 using OpenSim.Framework;
-using Environment=NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/SByteType.cs b/OpenSim/Data/NHibernate/SByteType.cs
index 0d8431d..f41cb33 100644
--- a/OpenSim/Data/NHibernate/SByteType.cs
+++ b/OpenSim/Data/NHibernate/SByteType.cs
@@ -27,8 +27,6 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
index 88be17f..292b3b4 100644
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -28,9 +28,9 @@
 using System;
 using System.IO;
 using System.Reflection;
-using OpenSim.Framework;
 using log4net;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
index d6c7f8f..8296556 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
index e70b32b..9aa1ba8 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using OpenSim.Data.NHibernate;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             }
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
index 7500574..c3c2c93 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@@ -26,16 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
index add8883..5cf0a5b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
index 01b0236..2b0da74 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
index 93b92ed..96194c6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
index c845d2c..60b197c 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using OpenSim.Data.NHibernate;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             }
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
index f91d058..8415fdf 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@@ -26,16 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
index 4db8375..89ab928 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
index 3bc0f4b..a50df9b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
index 50632d1..33a36e6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
@@ -26,14 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
index a6e9891..93f1ee1 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
@@ -26,14 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenMetaverse;
-using OpenSim.Data.NHibernate;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             }
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
index 057996b..afad336 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
@@ -26,15 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
index 4fc89f8..9967af7 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
@@ -26,14 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
index 1abf97b..0edfdcb 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
@@ -26,14 +26,8 @@
  */
 
 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
index 77bbb08..cc4915b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@@ -27,14 +27,8 @@
 
 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
index 6e7d7af..a358b27 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@@ -27,14 +27,8 @@
 
 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using OpenSim.Data.NHibernate;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
             }
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
index 45c77f7..297a661 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@@ -27,15 +27,8 @@
 
 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -63,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
index 6e84110..f188736 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@@ -27,14 +27,8 @@
 
 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
index 90edbc2..d94dac0 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@@ -27,14 +27,8 @@
 
 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
             } 
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                 Assert.Ignore();
             }
         }
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index ff949d4..57a580d 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -27,11 +27,11 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
+using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.NHibernate
 {
diff --git a/OpenSim/Data/NHibernate/UInt16Type.cs b/OpenSim/Data/NHibernate/UInt16Type.cs
index b805288..907e832 100644
--- a/OpenSim/Data/NHibernate/UInt16Type.cs
+++ b/OpenSim/Data/NHibernate/UInt16Type.cs
@@ -27,8 +27,6 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UInt32Type.cs b/OpenSim/Data/NHibernate/UInt32Type.cs
index 2500194..2b4c24a 100644
--- a/OpenSim/Data/NHibernate/UInt32Type.cs
+++ b/OpenSim/Data/NHibernate/UInt32Type.cs
@@ -27,8 +27,6 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UInt64Type.cs b/OpenSim/Data/NHibernate/UInt64Type.cs
index 304c9371..362e62d 100644
--- a/OpenSim/Data/NHibernate/UInt64Type.cs
+++ b/OpenSim/Data/NHibernate/UInt64Type.cs
@@ -27,8 +27,6 @@
 
 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UserFriend.cs b/OpenSim/Data/NHibernate/UserFriend.cs
index ab6cd78..589acd1 100644
--- a/OpenSim/Data/NHibernate/UserFriend.cs
+++ b/OpenSim/Data/NHibernate/UserFriend.cs
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 0ec79ac..d01aaa0 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -27,8 +27,8 @@
 
 using System;
 using System.Collections;
-using OpenMetaverse;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index d28956f..f6f62a7 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 46d29a3..3fb33c2 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -28,15 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
-using Mono.Data.SqliteClient;
 using log4net;
+using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Data.SQLite
 {
@@ -109,7 +106,7 @@ namespace OpenSim.Data.SQLite
                         else
                             m_FieldMap[name].SetValue(es, false);
                     }
-                    else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
+                    else if (m_FieldMap[name].GetValue(es) is UUID)
                     {
                         UUID uuid = UUID.Zero;
 
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 5b0455d..6c7c58c 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -29,10 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index c497396..6391c6d 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index a936ec1..4d45d08 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite
 {
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 89308db..7ec4ceb 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -28,13 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
 using System.IO;
 using System.Reflection;
-using System.Threading;
-using System.Drawing;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 1c36453..788a9ea 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
@@ -645,7 +645,7 @@ namespace OpenSim.Data.SQLite
             try {
                 aa = aplist[user];
                 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
-            } catch (System.Collections.Generic.KeyNotFoundException) {
+            } catch (KeyNotFoundException) {
                 m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
             }
             return aa;
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index 0de965d..60aa1f3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -25,16 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
         public void Cleanup()
         {
             db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index 31efcc3..774cca1 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -25,16 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite.Tests
 {
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 07b0dab..70903c3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -25,17 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
 
 namespace OpenSim.Data.SQLite.Tests
 {
@@ -61,7 +53,7 @@ namespace OpenSim.Data.SQLite.Tests
         public void Cleanup()
         {
             db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
         }
     }
 }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 86a1192..652a53a 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -25,16 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
         public void Cleanup()
         {
             db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 0415219..6f8d89d 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -25,16 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 
 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
         public void Cleanup()
         {
             db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 10cd35f..4d2bbc7 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -26,13 +26,11 @@
  */
 
 using System;
-using System.Collections.Generic;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.Tests
 {
@@ -48,7 +46,7 @@ namespace OpenSim.Data.Tests
         {
             try
             {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
             }
             catch (Exception)
             {
diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs
index 325014b..24c25ec 100644
--- a/OpenSim/Data/Tests/BasicEstateTest.cs
+++ b/OpenSim/Data/Tests/BasicEstateTest.cs
@@ -26,14 +26,11 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Text;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
-using OpenSim.Data;
 using OpenMetaverse;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Data.Tests
@@ -49,7 +46,7 @@ namespace OpenSim.Data.Tests
         {
             try
             {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
             }
             catch (Exception)
             {
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index adf3879..e3256ff 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -28,11 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace OpenSim.Data.Tests
@@ -49,7 +47,7 @@ namespace OpenSim.Data.Tests
         {
             try
             {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
             }
             catch (Exception)
             {
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index 1e13ec4..1b8a5de 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -26,13 +26,11 @@
  */
 
 using System;
-using System.Collections.Generic;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
-using OpenSim.Data;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.Tests
 {
@@ -67,7 +65,7 @@ namespace OpenSim.Data.Tests
         {
             try
             {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
             }
             catch (Exception)
             {
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index d60dadd..8e58443 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -29,14 +29,13 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Text;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Data;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Land;
-using OpenMetaverse;
 
 namespace OpenSim.Data.Tests
 {
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
         {
             try
             {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
             }
             catch (Exception)
             {
@@ -140,7 +139,7 @@ namespace OpenSim.Data.Tests
             }
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
+                Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
                 Assert.Fail();
             }
                     
@@ -150,7 +149,7 @@ namespace OpenSim.Data.Tests
             }
             catch (Exception e)
             {
-                System.Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
+                Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
                 Assert.Fail();
             }
 
@@ -651,7 +650,7 @@ namespace OpenSim.Data.Tests
         }
         
         [Test]
-        [ExpectedException(typeof(System.ArgumentException))]
+        [ExpectedException(typeof(ArgumentException))]
         public void T026_PrimInventoryMany()
         {
             UUID i1,i2,i3,i4;
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index 5464ade..f0a90a9 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -30,12 +30,11 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.Tests
 {
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
         {
             try
             {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
             }
             catch (Exception)
             {
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index eaad7ae..0fa9e58 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -25,10 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Reflection;
 using System.Collections.Generic;
 using OpenMetaverse;
-using log4net;
 using OpenSim.Framework;
 
 namespace OpenSim.Data
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 9d40af9..1c37601 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -28,10 +28,7 @@
 using System;
 using System.Collections.Generic;
 using OpenMetaverse;
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-using OSDParser = OpenMetaverse.StructuredData.OSDParser;
+using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework
 {
@@ -108,13 +105,13 @@ namespace OpenSim.Framework
             if (args["caps_path"] != null)
                 CapsPath = args["caps_path"].AsString();
 
-            if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OpenMetaverse.StructuredData.OSDType.Array))
+            if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OSDType.Array))
             {
                 OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]);
                 ChildrenCapSeeds = new Dictionary<ulong, string>();
                 foreach (OSD o in childrenSeeds)
                 {
-                    if (o.Type == OpenMetaverse.StructuredData.OSDType.Map)
+                    if (o.Type == OSDType.Map)
                     {
                         ulong handle = 0;
                         string seed = "";
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 88ac4a6..dfe559e 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -26,9 +26,7 @@
  */
 
 using System;
-using System.Collections.Generic;
 using OpenMetaverse;
-using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework
 {
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index cc0217f..233c3d0 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.IO;
 
 namespace OpenSim.Framework
 {
@@ -62,7 +63,7 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                         "Location of 'AssetSets.xml'",
-                                        string.Format(".{0}assets{0}AssetSets.xml", System.IO.Path.DirectorySeparatorChar), false);
+                                        string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar), false);
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 55b4ebd..01cbfce 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using OpenMetaverse;
 
 /// <summary>
 /// Loads assets from the filesystem location.  Not yet a plugin, though it should be.
diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index 6c37c66..3dab9b6 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -383,7 +383,7 @@ namespace OpenSim.Framework
 
         // Find an object in cache by delegate.
         //
-        public Object Find(Predicate<OpenSim.Framework.CacheItemBase> d)
+        public Object Find(Predicate<CacheItemBase> d)
         {
             CacheItemBase item = m_Index.Find(d);
 
@@ -460,7 +460,7 @@ namespace OpenSim.Framework
 
             if (m_DefaultTTL.Ticks != 0)
             {
-                DateTime now= System.DateTime.Now;
+                DateTime now= DateTime.Now;
 
                 foreach (CacheItemBase item in new List<CacheItemBase>(m_Index))
                 {
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 34f2866..0e72e47 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -26,14 +26,10 @@
  */
 
 using System;
-using OpenMetaverse;
 using System.Collections;
 using System.Collections.Generic;
-
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-using OSDParser = OpenMetaverse.StructuredData.OSDParser;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework
 {
@@ -486,7 +482,7 @@ namespace OpenSim.Framework
             if (args["agent_access"] != null)
                 Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
 
-            if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OpenMetaverse.StructuredData.OSDType.Array)
+            if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
             {
                 OSDArray textures = (OSDArray)(args["agent_textures"]);
                 AgentTextures = new UUID[textures.Count];
@@ -498,28 +494,28 @@ namespace OpenSim.Framework
             if (args["active_group_id"] != null)
                 ActiveGroupID = args["active_group_id"].AsUUID();
 
-            if ((args["groups"] != null) && (args["groups"]).Type == OpenMetaverse.StructuredData.OSDType.Array)
+            if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
             {
                 OSDArray groups = (OSDArray)(args["groups"]);
                 Groups = new AgentGroupData[groups.Count];
                 int i = 0;
                 foreach (OSD o in groups)
                 {
-                    if (o.Type == OpenMetaverse.StructuredData.OSDType.Map)
+                    if (o.Type == OSDType.Map)
                     {
                         Groups[i++] = new AgentGroupData((OSDMap)o);
                     }
                 }
             }
 
-            if ((args["animations"] != null) && (args["animations"]).Type == OpenMetaverse.StructuredData.OSDType.Array)
+            if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array)
             {
                 OSDArray anims = (OSDArray)(args["animations"]);
                 Anims = new AgentAnimationData[anims.Count];
                 int i = 0;
                 foreach (OSD o in anims)
                 {
-                    if (o.Type == OpenMetaverse.StructuredData.OSDType.Map)
+                    if (o.Type == OSDType.Map)
                     {
                         Anims[i++] = new AgentAnimationData((OSDMap)o);
                     }
diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs
index c89bf53..078ea9b 100644
--- a/OpenSim/Framework/Client/IClientChat.cs
+++ b/OpenSim/Framework/Client/IClientChat.cs
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
 
 namespace OpenSim.Framework.Client
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 2296e46..1c8f9d6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -29,11 +29,11 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
+using GlynnTucker.Cache;
+using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
-using log4net;
 using OpenSim.Framework.Statistics;
-using GlynnTucker.Cache;
 
 namespace OpenSim.Framework.Communications.Cache
 {
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index cc5ba8e..5c902ec 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -28,11 +28,11 @@
 using System;
 using System.Reflection;
 using System.Threading;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
+using OpenSim.Data;
 using OpenSim.Framework.AssetLoader.Filesystem;
 using OpenSim.Framework.Statistics;
-using OpenSim.Data;
 
 namespace OpenSim.Framework.Communications.Cache
 {
diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
index be10e96..d56e48a 100644
--- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
@@ -27,7 +27,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Framework.Communications.Cache
 {
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 99a982b..15066cd 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -28,10 +28,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
-
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 
 namespace OpenSim.Framework.Communications.Cache
 {
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
index 038c591..55db289 100644
--- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://www.openmetaverse.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -34,11 +34,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Security.Cryptography;
 using System.Text;
 using System.Xml.Serialization;
 using log4net;
 using OpenSim.Framework.Servers;
-using System.Security.Cryptography;
 
 namespace OpenSim.Framework.Communications.Cache
 {
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 4c629f4..58c3269 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using OpenMetaverse;
+
 //using System.Reflection;
 
 //using log4net;
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 0b05adf..93f126f 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using OpenMetaverse;
 
 namespace OpenSim.Framework.Communications.Cache
 {
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 22aab10..ef190c8 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -25,12 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 
 namespace OpenSim.Framework.Communications.Cache
 {
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index cfe9002..b68083e 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -30,11 +30,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
-using OpenSim.Framework.Communications.Cache;
+using OpenMetaverse;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework;
+
 // using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Framework.Communications.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
index 829b4e5..874a27f 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using OpenMetaverse;
 
 namespace OpenSim.Framework.Communications.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index c68a205..906f5d5 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -27,7 +27,6 @@
 
 using System.Collections;
 using System.IO;
-using System.Net;
 using System.Text;
 using OpenSim.Framework.Servers;
 
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 2107f63..936e583 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -25,11 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Reflection;
 using OpenMetaverse;
-using log4net;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index bd108c1..488ce8e 100644
--- a/OpenSim/Framework/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -34,7 +34,6 @@ using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications
 {
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
index 25b26dd..3822e9f 100644
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ b/OpenSim/Framework/Communications/IAvatarService.cs
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
 
 namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Framework/Communications/IHyperlink.cs
index fa088d6..6c61d82 100644
--- a/OpenSim/Framework/Communications/IHyperlink.cs
+++ b/OpenSim/Framework/Communications/IHyperlink.cs
@@ -25,11 +25,6 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications
 {
diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs
index 6d4ce46..6da13fe 100644
--- a/OpenSim/Framework/Communications/ISecureInventoryService.cs
+++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
 using OpenMetaverse;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Framework.Communications
 {
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 8753c64..de76415 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -25,14 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
-
-using OpenMetaverse;
 using log4net;
-
+using OpenMetaverse;
 using OpenSim.Data;
 
 namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 867e9e6..d1b9258 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -29,10 +29,10 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework.Communications
 {
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index fe904b5..ae16715 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -33,10 +33,10 @@ using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Web;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Statistics;
 
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 970f2a9..69932fc 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -291,7 +291,7 @@ namespace OpenSim.Framework.Communications
                 {
                     _response = (HttpWebResponse) _request.GetResponse();
                 }
-                catch (System.Net.WebException e)
+                catch (WebException e)
                 {
                     m_log.ErrorFormat("[ASSET] Error fetching asset from asset server");
                     m_log.Debug(e.ToString());
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 86d85b1..cda9d5c 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -25,16 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using log4net;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
-//using OpenSim.Framework;
+using OpenSim.Data;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.Local;
 using OpenSim.Tests.Common.Mock;
-using OpenSim.Data;
+//using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications.Tests
 {
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
index cf07ae5..85cc940 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
@@ -26,10 +26,8 @@
  */
 
 using OpenMetaverse;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Communications.Local;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Framework.Communications.Tests
 {    
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index ffa3c5f..57ed0f5 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -29,8 +29,6 @@ using System;
 using System.Collections;
 using System.Net;
 using System.Text.RegularExpressions;
-using System.Xml;
-using Nini;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using Nwc.XmlRpc;
@@ -61,7 +59,7 @@ namespace OpenSim.Framework.Communications.Tests
             IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
 
             CommunicationsManager commsManager
-                = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43));
+                = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
 
             commsManager.GridService.RegisterRegion(
                 new RegionInfo(42, 43, capsEndPoint, regionExternalName));
@@ -89,7 +87,7 @@ namespace OpenSim.Framework.Communications.Tests
             Assert.That(responseData["first_name"], Is.EqualTo(firstName));
             Assert.That(responseData["last_name"], Is.EqualTo(lastName));
             Assert.That(
-                responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue));
+                responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
 
             Regex capsSeedPattern
                 = new Regex("^http://"
@@ -108,7 +106,7 @@ namespace OpenSim.Framework.Communications.Tests
             IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
 
             CommunicationsManager commsManager
-                = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43));
+                = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
 
             commsManager.GridService.RegisterRegion(
                 new RegionInfo(42, 43, capsEndPoint, regionExternalName));
@@ -159,7 +157,7 @@ namespace OpenSim.Framework.Communications.Tests
             Hashtable invlibroothash = (Hashtable) invlibroot[0];
             Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000"));
             Assert.That(
-                responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue));
+                responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
             Assert.That(responseData["message"], Is.EqualTo("Hello folks"));
             Assert.That(responseData["buddy-list"], Is.Empty);
             Assert.That(responseData["start_location"], Is.EqualTo("last"));
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 0af9652..62c3f89 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -26,17 +26,16 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using System.Security.Cryptography;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
 using log4net;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Statistics;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using OpenSim.Data;
+using OpenSim.Framework.Statistics;
 
 namespace OpenSim.Framework.Communications
 {
diff --git a/OpenSim/Framework/Communications/XMPP/XmppError.cs b/OpenSim/Framework/Communications/XMPP/XmppError.cs
index 1698b6a..8b7e502 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppError.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppError.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Xml;
 using System.Xml.Serialization;
 
 namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
index 1789536..26a98ec 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Xml;
 using System.Xml.Serialization;
 
 namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
index fd4cd5f..d150708 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Xml;
 using System.Xml.Serialization;
 
 namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
index d63a0d1..95d2ca3 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Xml;
 using System.Xml.Serialization;
 
 namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
index eb9dabe..888686b 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
@@ -27,12 +27,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
-using log4net;
 
 namespace OpenSim.Framework.Communications.XMPP
 {
diff --git a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
index 00df14a..db3c5eb 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using System.Xml;
 using System.Xml.Serialization;
 
 namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
index c5ad9b4..4937f7a 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
@@ -28,7 +28,6 @@
 using System.IO;
 using System.Text;
 using System.Xml;
-
 using IOStream = System.IO.Stream;
 
 namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index b54aafb..1868168 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -288,7 +288,7 @@ namespace OpenSim.Framework
                     // if the first character is a "$", assume it's the name
                     // of an environment variable and substitute with the value of that variable
                     if (console_result.StartsWith("$"))
-                        console_result = System.Environment.GetEnvironmentVariable(console_result.Substring(1));
+                        console_result = Environment.GetEnvironmentVariable(console_result.Substring(1));
 
                     switch (configOption.configurationType)
                     {
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 721e91a..793270b 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -26,10 +26,11 @@
  */
 
 using System;
-using System.Text;
-using System.Reflection;
-using System.Diagnostics;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text;
+using System.Threading;
 using log4net;
 
 namespace OpenSim.Framework.Console
@@ -77,8 +78,8 @@ namespace OpenSim.Framework.Console
         /// <value>
         /// Commands organized by keyword in a tree
         /// </value>
-        private Dictionary<string, Object> tree =
-                new Dictionary<string, Object>();
+        private Dictionary<string, object> tree =
+                new Dictionary<string, object>();
 
         /// <summary>
         /// Get help for the given help string
@@ -149,7 +150,7 @@ namespace OpenSim.Framework.Console
             return help;
         }            
 
-        private List<string> CollectHelp(Dictionary<string, Object> dict)
+        private List<string> CollectHelp(Dictionary<string, object> dict)
         {
             List<string> result = new List<string>();
 
@@ -708,7 +709,7 @@ namespace OpenSim.Framework.Console
 
         public void LockOutput()
         {
-            System.Threading.Monitor.Enter(cmdline);
+            Monitor.Enter(cmdline);
             try
             {
                 if (y != -1)
@@ -738,7 +739,7 @@ namespace OpenSim.Framework.Console
                 y = System.Console.CursorTop;
                 Show();
             }
-            System.Threading.Monitor.Exit(cmdline);
+            Monitor.Exit(cmdline);
         }
 
         public void Output(string text)
diff --git a/OpenSim/Framework/ForeignUserProfileData.cs b/OpenSim/Framework/ForeignUserProfileData.cs
index 4f734a7..f971eb0 100644
--- a/OpenSim/Framework/ForeignUserProfileData.cs
+++ b/OpenSim/Framework/ForeignUserProfileData.cs
@@ -28,8 +28,6 @@
 
 using System;
 
-using OpenSim.Framework;
-
 namespace OpenSim.Framework
 {
     public class ForeignUserProfileData : UserProfileData
diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs
index 227200e..803c712 100644
--- a/OpenSim/Framework/HGNetworkServersInfo.cs
+++ b/OpenSim/Framework/HGNetworkServersInfo.cs
@@ -26,12 +26,8 @@
  * 
  */
 
-using System;
-using System.Collections.Generic;
 using System.Net;
 
-using OpenSim.Framework;
-
 namespace OpenSim.Framework
 {
     public class HGNetworkServersInfo
diff --git a/OpenSim/Framework/IClientFileTransfer.cs b/OpenSim/Framework/IClientFileTransfer.cs
index ac5fc2b..f947b17 100644
--- a/OpenSim/Framework/IClientFileTransfer.cs
+++ b/OpenSim/Framework/IClientFileTransfer.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 7904e94..ae31e3c 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
diff --git a/OpenSim/Framework/IPlugin.cs b/OpenSim/Framework/IPlugin.cs
index 1eb1c06..01ea475 100644
--- a/OpenSim/Framework/IPlugin.cs
+++ b/OpenSim/Framework/IPlugin.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework
     /// <summary>
     /// This interface, describes a generic plugin
     /// </summary>
-    public interface IPlugin : System.IDisposable
+    public interface IPlugin : IDisposable
     {
         /// <summary>
         /// Returns the plugin version
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 1c0a3b5..c400309 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework.Console;
 
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index 6f61ab5..6c9b86d 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenMetaverse;
-
+using OpenMetaverse;

+

 namespace OpenSim.Framework
 {
     /// <summary>
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 2ff59cd..f361cc3 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
             }
         }
 
-        public OpenMetaverse.Parcel.ParcelCategory Category {
+        public Parcel.ParcelCategory Category {
             get {
                 return _category;
             }
@@ -233,7 +233,7 @@ namespace OpenSim.Framework
             }
         }
 
-        public OpenMetaverse.Parcel.ParcelStatus Status {
+        public Parcel.ParcelStatus Status {
             get {
                 return _status;
             }
@@ -314,7 +314,7 @@ namespace OpenSim.Framework
             }
         }
 
-        public List<OpenMetaverse.ParcelManager.ParcelAccessEntry> ParcelAccessList {
+        public List<ParcelManager.ParcelAccessEntry> ParcelAccessList {
             get {
                 return _parcelAccessList;
             }
diff --git a/OpenSim/Framework/Servers/BaseHTTPHandler.cs b/OpenSim/Framework/Servers/BaseHTTPHandler.cs
index a7c3562..2aa37fb 100644
--- a/OpenSim/Framework/Servers/BaseHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/BaseHTTPHandler.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections;
 
 namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index d69b2c0..620a7f6 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -35,12 +35,12 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Xml;
-using OpenMetaverse.StructuredData;
+using HttpServer;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse.StructuredData;
 using CoolHTTPListener = HttpServer.HttpListener;
-using IHttpClientContext = HttpServer.IHttpClientContext;
-using IHttpRequest = HttpServer.IHttpRequest;
+using HttpListener=System.Net.HttpListener;
 
 namespace OpenSim.Framework.Servers
 {
@@ -219,7 +219,7 @@ namespace OpenSim.Framework.Servers
         public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request)
         {
             OSHttpRequest req = new OSHttpRequest(context, request);
-            OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(context, request));
+            OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request));
             //resp.KeepAlive = req.KeepAlive;
             //m_log.Info("[Debug BASE HTTP SERVER]: Got Request");
             //HttpServerContextObj objstate= new HttpServerContextObj(req,resp);
@@ -1373,7 +1373,7 @@ namespace OpenSim.Framework.Servers
                 {
                     //m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
                     //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/");
-                    m_httpListener2 = new HttpServer.HttpListener(IPAddress.Any, (int)m_port);
+                    m_httpListener2 = new CoolHTTPListener(IPAddress.Any, (int)m_port);
                     m_httpListener2.ExceptionThrown += httpServerException;
                     m_httpListener2.LogWriter = httpserverlog;
                     
@@ -1408,7 +1408,7 @@ namespace OpenSim.Framework.Servers
             }
         }
 
-        public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err)
+        public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err)
         {            
             switch (err)
             {
@@ -1564,11 +1564,11 @@ namespace OpenSim.Framework.Servers
     /// Relays HttpServer log messages to our own logging mechanism.
     /// </summary>
     /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
-    public class HttpServerLogWriter : HttpServer.ILogWriter
+    public class HttpServerLogWriter : ILogWriter
     {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public void Write(object source, HttpServer.LogPrio priority, string message)
+        public void Write(object source, LogPrio priority, string message)
         {
             /*
             switch (priority)
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index ff53e1a..4cbbecc 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -38,6 +38,7 @@ using log4net.Core;
 using log4net.Repository;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Statistics;
+using Timer=System.Timers.Timer;
 
 namespace OpenSim.Framework.Servers
 {
@@ -52,7 +53,7 @@ namespace OpenSim.Framework.Servers
         /// This will control a periodic log printout of the current 'show stats' (if they are active) for this
         /// server.
         /// </summary>
-        private System.Timers.Timer m_periodicDiagnosticsTimer = new System.Timers.Timer(60 * 60 * 1000);
+        private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
 
         protected ConsoleBase m_console;
 
@@ -266,7 +267,7 @@ namespace OpenSim.Framework.Servers
 
             // If there is no threshold set then the threshold is effectively everything.
             Level thresholdLevel
-                = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All);
+                = (null != consoleAppender.Threshold ? consoleAppender.Threshold : Level.All);
 
             Notice(String.Format("Console log level is {0}", thresholdLevel));
         }
diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs
index 6b0614f..771def4 100644
--- a/OpenSim/Framework/Servers/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs
@@ -26,7 +26,6 @@
  */
 
 using System.IO;
-using System.Net;
 
 namespace OpenSim.Framework.Servers
 {
diff --git a/OpenSim/Framework/Servers/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
index 26a6f10..6540798 100644
--- a/OpenSim/Framework/Servers/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
@@ -27,7 +27,6 @@
 
 using System.IO;
 using System.Text;
-using System.Net;
 
 namespace OpenSim.Framework.Servers
 {
diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/IHttpAgentHandler.cs
index ff3a5b9..e6ad57e 100644
--- a/OpenSim/Framework/Servers/IHttpAgentHandler.cs
+++ b/OpenSim/Framework/Servers/IHttpAgentHandler.cs
@@ -25,10 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections;
-using System.IO;
-using System.Net;
-
 namespace OpenSim.Framework.Servers
 {
     public interface IHttpAgentHandler
diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/IStreamHandler.cs
index b3ce34d..76bf4d5 100644
--- a/OpenSim/Framework/Servers/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/IStreamHandler.cs
@@ -27,7 +27,6 @@
 
 using System.Collections;
 using System.IO;
-using System.Net;
 
 namespace OpenSim.Framework.Servers
 {
diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs
index 4c7d7ce..8e0cb38 100644
--- a/OpenSim/Framework/Servers/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequest.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Net;
 using System.IO;
+using System.Net;
 using System.Reflection;
 using System.Text;
 using HttpServer;
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs
index 4947156..ff02edd 100644
--- a/OpenSim/Framework/Servers/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/OSHttpResponse.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
 using System.IO;
 using System.Net;
 using System.Text;
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
index 5c2dd4a..41d86e5 100644
--- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
@@ -26,7 +26,6 @@
  */
 
 using System.IO;
-using System.Net;
 using System.Xml;
 using System.Xml.Serialization;
 
diff --git a/OpenSim/Framework/Servers/RestHTTPHandler.cs b/OpenSim/Framework/Servers/RestHTTPHandler.cs
index 2974c56..5722885 100644
--- a/OpenSim/Framework/Servers/RestHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/RestHTTPHandler.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections;
 
 namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs
index 958ee26..60da05e 100644
--- a/OpenSim/Framework/Servers/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/RestSessionService.cs
@@ -28,12 +28,10 @@
 using System;
 using System.IO;
 using System.Net;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
-
 using log4net;
 
 namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/RestStreamHandler.cs b/OpenSim/Framework/Servers/RestStreamHandler.cs
index 44c9dfc..afd7fe5 100644
--- a/OpenSim/Framework/Servers/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/RestStreamHandler.cs
@@ -27,7 +27,6 @@
 
 using System.IO;
 using System.Text;
-using System.Net;
 
 namespace OpenSim.Framework.Servers
 {
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index fe553c9..3a297bf 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -31,23 +31,18 @@ using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-
 using HttpServer;
-using HttpServer.Exceptions;
 using HttpServer.FormDecoders;
-
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 
-using OpenSim.Framework.Servers;
-
 namespace OpenSim.Framework.Servers.Tests
 {
     [TestFixture]
     public class OSHttpTests
     {
         // we need an IHttpClientContext for our tests
-        public class TestHttpClientContext: HttpServer.IHttpClientContext
+        public class TestHttpClientContext: IHttpClientContext
         {
             private bool _secured;
             public bool Secured
@@ -68,7 +63,7 @@ namespace OpenSim.Framework.Servers.Tests
             public void Send(byte[] buffer, int offset, int size) {}
         }
 
-        public class TestHttpRequest: HttpServer.IHttpRequest
+        public class TestHttpRequest: IHttpRequest
         {
             public bool BodyIsComplete 
             { 
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index 865dee2..8280708 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using OpenMetaverse;
 using OpenMetaverse.Packets;
 
 namespace OpenSim.Framework
@@ -73,15 +74,15 @@ namespace OpenSim.Framework
         }
         private uint m_objectCapacity;
 
-        public OpenMetaverse.UUID RegionUUID
+        public UUID RegionUUID
         {
             get { return regionUUID;}   
         }
-        private OpenMetaverse.UUID regionUUID;
+        private UUID regionUUID;
                 
         public SimStats(
             uint regionX, uint regionY, uint regionFlags, uint objectCapacity, 
-            SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, OpenMetaverse.UUID pRUUID)
+            SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, UUID pRUUID)
         {
             regionUUID = pRUUID;
             m_regionX = regionX;
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 43c73b2..ce654eb 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework.Statistics.Interfaces;
 
 namespace OpenSim.Framework.Statistics
diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index 5617e2b..b45a42f 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenMetaverse;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace OpenSim.Framework.Tests
 {
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 0224356..c5f1800 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenMetaverse;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
 using OpenSim.Tests.Common;
 
 namespace OpenSim.Framework.Tests
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index cc048b7..901b57a 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.IO;
 
 namespace OpenSim.Framework
 {
@@ -113,7 +114,7 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("library_location",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Path to library control file",
-                                                string.Format(".{0}inventory{0}Libraries.xml", System.IO.Path.DirectorySeparatorChar), false);            
+                                                string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);            
             
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index df7a552..9949ad8 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -194,7 +194,7 @@ namespace OpenSim.Framework
         }
 
         public static T Clamp<T>(T x, T min, T max)
-            where T : System.IComparable<T>
+            where T : IComparable<T>
         {
             return x.CompareTo(max) > 0 ? max :
                 x.CompareTo(min) < 0 ? min :
@@ -758,8 +758,8 @@ namespace OpenSim.Framework
             memory.Read(compressed, 0, compressed.Length);
 
             byte[] compressedBuffer = new byte[compressed.Length + 4];
-            System.Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length);
-            System.Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4);
+            Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length);
+            Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4);
             return Convert.ToBase64String(compressedBuffer);
         }
 
@@ -872,9 +872,9 @@ namespace OpenSim.Framework
         {
             string os = String.Empty;
 
-            if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+            if (Environment.OSVersion.Platform != PlatformID.Unix)
             {
-                os = System.Environment.OSVersion.ToString();
+                os = Environment.OSVersion.ToString();
             }
             else
             {
diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs
index 414b135..7a4b4de 100644
--- a/OpenSim/Framework/WearableItem.cs
+++ b/OpenSim/Framework/WearableItem.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Framework
                 //int randNum = Util.RandomClass.Next(0, 1000);
                 float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue;
                 // float val =((float) randNum )/ ((float)(1000.0f / range));
-                float val = (float)OpenSim.Framework.Util.RandomClass.NextDouble() * range * 0.2f;
+                float val = (float)Util.RandomClass.NextDouble() * range * 0.2f;
                 setting.Value = setting.VisualParam.MinValue + (range / 2) + val;
             }
         }
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 4609ee8..5b23d5a 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -28,15 +28,15 @@
 using System;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using log4net.Config;
+using OpenMetaverse;
+using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.AssetLoader.Filesystem;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
-using OpenSim.Data;
 
 namespace OpenSim.Grid.AssetServer
 {
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index a44af6c..ba62c55 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -27,17 +27,16 @@
 
 using System;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
+using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
-using OpenSim.Data;
 
 namespace OpenSim.Grid.AssetServer
 {
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index f98809d..5dc186c 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -26,15 +26,14 @@
  */
 
 using System;
-using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 9cc25e8..bcd1403 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 0032922..3b3bb42 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using log4net.Config;
 
 namespace OpenSim.Grid.GridServer
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 78d9f65..16d8154 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -28,14 +28,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Threading;
 using System.Net;
-
-using OpenMetaverse;
+using System.Reflection;
 using log4net;
 using Nwc.XmlRpc;
-
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 862ae58..8ca7c3d 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using log4net.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 13f52ab..2f63ee9 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -28,12 +28,9 @@
 using System;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using log4net.Config;
-
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 7a4a47f..36f8b91 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -29,13 +29,15 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Net;
-using System.Threading;
 using System.Reflection;
-using OpenMetaverse;
+using System.Threading;
+using System.Timers;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
+using Timer=System.Timers.Timer;
 
 namespace OpenSim.Grid.MessagingServer
 {
@@ -52,7 +54,7 @@ namespace OpenSim.Grid.MessagingServer
         // a dictionary of all current regions this server knows about
         private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>();
 
-        private System.Timers.Timer reconnectTimer = new System.Timers.Timer(300000); // 5 mins
+        private Timer reconnectTimer = new Timer(300000); // 5 mins
 
         public MessageService(MessageServerConfig cfg)
         {
@@ -502,7 +504,7 @@ namespace OpenSim.Grid.MessagingServer
             return regionProfile;
         }
 
-        public void registerWithUserServer(object sender, System.Timers.ElapsedEventArgs e)
+        public void registerWithUserServer(object sender, ElapsedEventArgs e)
         {
             registerWithUserServer();
         }
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
index 7ea1ac7..08566bb 100644
--- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse;
 
 namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index 39fcadb..20342ab 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -26,8 +26,8 @@
  */
 
 using System.Collections;
-using System.Reflection;
 using System.Net;
+using System.Reflection;
 using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Data;
diff --git a/OpenSim/Grid/MessagingServer/PresenceService.cs b/OpenSim/Grid/MessagingServer/PresenceService.cs
index df5f687..d8cb755 100644
--- a/OpenSim/Grid/MessagingServer/PresenceService.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceService.cs
@@ -25,10 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Grid.MessagingServer
 {
     class PresenceService
diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs
index fc8f703..4b07df7 100644
--- a/OpenSim/Grid/MessagingServer/UserManager.cs
+++ b/OpenSim/Grid/MessagingServer/UserManager.cs
@@ -25,17 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text.RegularExpressions;
 using OpenMetaverse;
-using log4net;
-using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.MessagingServer
 {
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index 9d3f2bf..87647cd 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -27,10 +27,9 @@
 
 using System;
 using System.IO;
-using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index dd3f0b7..3f75838 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -28,11 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using log4net.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 6da67d7..8d16109 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -29,12 +29,12 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
+using System.Threading;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using System.Threading;
 
 namespace OpenSim.Grid.UserServer
 {
diff --git a/OpenSim/Grid/UserServer/OpenIdService.cs b/OpenSim/Grid/UserServer/OpenIdService.cs
index 78e820e..187758f 100644
--- a/OpenSim/Grid/UserServer/OpenIdService.cs
+++ b/OpenSim/Grid/UserServer/OpenIdService.cs
@@ -31,10 +31,8 @@ using System.Collections.Specialized;
 using System.IO;
 using System.Net;
 using System.Web;
-using System.Text;
 using DotNetOpenId;
 using DotNetOpenId.Provider;
-using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 0caefb1..905f4aa 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -30,9 +30,9 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 65e19b2..4da5f2e 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0195bfa..b8fa786 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -27,14 +27,12 @@
 
 using System;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using log4net;
 using log4net.Config;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3492a19..228c0aa 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -26,18 +26,13 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using System.Threading;
 using System.IO;
-using OpenSim.Framework;
-using Nini;
-using Nini.Config;
-
 using System.Reflection;
+using System.Threading;
+using System.Xml;
 using log4net;
-
+using Nini.Config;
+using OpenSim.Framework;
 
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 03e22ca..7d4a39c 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -26,31 +26,21 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
-using System.Net;
 using System.Reflection;
-using System.Xml;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Statistics;
-using OpenSim.Region.ClientStack;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.Local;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Hypergrid;
-using OpenSim.Region.CoreModules;
+using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Framework;
-using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
 
-using Timer = System.Timers.Timer;
-
 namespace OpenSim
 {
     public class HGOpenSimNode : OpenSim
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index fbe3813..fdc55c7 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -29,20 +29,16 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Reflection;
-using System.Runtime;
-using System.Threading;
-using OpenMetaverse;
+using System.Timers;
 using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Statistics;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
-using Timer = System.Timers.Timer;
 
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 43cb127..f4e28be 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -28,11 +28,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using System.Text;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
@@ -44,7 +41,6 @@ using OpenSim.Framework.Statistics;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -446,7 +442,7 @@ namespace OpenSim
 
                 // Carrying on now causes a lot of confusion down the
                 // line - we need to get the user's attention
-                System.Environment.Exit(1);
+                Environment.Exit(1);
             }
 
             // We need to do this after we've initialized the
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index f947d06..a7b65cb 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -31,9 +31,6 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.ClientStack;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Region.ClientStack
 {
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index 8bd5434..b0749c6 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -30,7 +30,6 @@ using System.Net.Sockets;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Region.ClientStack
 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
index 8197ec7..df6534f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse.Packets;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a785e64..3b8b48f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -33,17 +33,16 @@ using System.Text;
 using System.Threading;
 using System.Timers;
 using System.Xml;
+using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
-using OpenMetaverse.StructuredData;
-using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Statistics;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using Timer = System.Timers.Timer;
+using Timer=System.Timers.Timer;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
@@ -474,7 +473,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_PacketHandler.OnPacketStats += PopulateStats;
 
             RegisterLocalPacketHandlers();
-            m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Framework.Interfaces.IJ2KDecoder>());
+            m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<IJ2KDecoder>());
         }
 
         public void SetDebugPacketLevel(int newDebugPacketLevel)
@@ -1230,7 +1229,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             fromAgent, toAgent, false, false, false);
                     }
 
-                    System.Console.WriteLine("SendInstantMessage: " + msg);
+                    Console.WriteLine("SendInstantMessage: " + msg);
                 }
                 else
                     OutPacket(msg, ThrottleOutPacketType.Task);
@@ -6857,15 +6856,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                                               groupTitlesRequest.AgentData.GroupID);
 
                         groupTitlesReply.GroupData =
-                            new GroupTitlesReplyPacket.
-                                GroupDataBlock[titles.Count];
+                            new GroupTitlesReplyPacket.GroupDataBlock[titles.Count];
 
                         int i = 0;
                         foreach (GroupTitlesData d in titles)
                         {
                             groupTitlesReply.GroupData[i] =
-                                new GroupTitlesReplyPacket.
-                                    GroupDataBlock();
+                                new GroupTitlesReplyPacket.GroupDataBlock();
 
                             groupTitlesReply.GroupData[i].Title =
                                 Utils.StringToBytes(d.Name);
@@ -6980,8 +6977,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         groupRolesReply.AgentData.AgentID = AgentId;
 
                         groupRolesReply.GroupData =
-                            new GroupRoleDataReplyPacket.
-                                GroupDataBlock();
+                            new GroupRoleDataReplyPacket.GroupDataBlock();
 
                         groupRolesReply.GroupData.GroupID =
                             groupRolesRequest.GroupData.GroupID;
@@ -6997,15 +6993,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             titles.Count;
 
                         groupRolesReply.RoleData =
-                            new GroupRoleDataReplyPacket.
-                                RoleDataBlock[titles.Count];
+                            new GroupRoleDataReplyPacket.RoleDataBlock[titles.Count];
 
                         int i = 0;
                         foreach (GroupRolesData d in titles)
                         {
                             groupRolesReply.RoleData[i] =
-                                new GroupRoleDataReplyPacket.
-                                    RoleDataBlock();
+                                new GroupRoleDataReplyPacket.RoleDataBlock();
 
                             groupRolesReply.RoleData[i].RoleID =
                                 d.RoleID;
@@ -7051,15 +7045,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             (uint)mappings.Count;
 
                         groupRoleMembersReply.MemberData =
-                            new GroupRoleMembersReplyPacket.
-                                MemberDataBlock[mappings.Count];
+                            new GroupRoleMembersReplyPacket.MemberDataBlock[mappings.Count];
 
                         int i = 0;
                         foreach (GroupRoleMembersData d in mappings)
                         {
                             groupRoleMembersReply.MemberData[i] =
-                                new GroupRoleMembersReplyPacket.
-                                    MemberDataBlock();
+                                new GroupRoleMembersReplyPacket.MemberDataBlock();
 
                             groupRoleMembersReply.MemberData[i].RoleID =
                                 d.RoleID;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
index b801f7a..f79f62e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -27,16 +27,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Statistics;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 43a2e23..6f9e5d3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -27,13 +27,11 @@
 
 using System;
 using System.Collections.Generic;
+using C5;
 using OpenMetaverse;
+using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
-using C5;
-using OpenSim.Framework.Communications.Cache;
-using OpenMetaverse.Imaging;
-
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 97d75e1..23118a2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -26,19 +26,14 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using System.Timers;
-using System.Reflection;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
-using Timer = System.Timers.Timer;
 using OpenSim.Framework;
-using OpenSim.Region.ClientStack.LindenUDP;
-using log4net;
+using Timer=System.Timers.Timer;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
@@ -96,7 +91,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private Dictionary<uint, int> m_DupeTracker =
             new Dictionary<uint, int>();
         private uint m_DupeTrackerWindow = 30;
-        private int m_DupeTrackerLastCheck = System.Environment.TickCount;
+        private int m_DupeTrackerLastCheck = Environment.TickCount;
 
         // Values for the SimStatsReporter
         //
@@ -164,7 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             m_Client = client;
             m_PacketServer = server;
-            m_DropSafeTimeout = System.Environment.TickCount + 15000;
+            m_DropSafeTimeout = Environment.TickCount + 15000;
 
             m_PacketQueue = new LLPacketQueue(client.AgentId, userSettings);
 
@@ -225,9 +220,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // acks being appended to the payload, just don't send
             // any with them until libsl is fixed.
             //
-            if (packet is OpenMetaverse.Packets.ViewerEffectPacket)
+            if (packet is ViewerEffectPacket)
                 return;
-            if (packet is OpenMetaverse.Packets.SimStatsPacket)
+            if (packet is SimStatsPacket)
                 return;
 
             // Add acks to outgoing packets
@@ -261,7 +256,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             item.Packet = packet;
             item.Incoming = false;
             item.throttleType = throttlePacketType;
-            item.TickCount = System.Environment.TickCount;
+            item.TickCount = Environment.TickCount;
             item.Identifier = id;
             item.Resends = 0;
             item.Length = packet.ToBytes().Length;
@@ -272,7 +267,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void ResendUnacked()
         {
-            int now = System.Environment.TickCount;
+            int now = Environment.TickCount;
 
             int intervalMs = 250;
 
@@ -341,7 +336,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             }
 
                             m_NeedAck[packet.Header.Sequence].TickCount =
-                                    System.Environment.TickCount;
+                                    Environment.TickCount;
 
                             QueuePacket(packet, ThrottleOutPacketType.Resend,
                                     data.Identifier);
@@ -463,10 +458,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (m_DupeTracker.Count < 1024)
                     return;
 
-                if (System.Environment.TickCount - m_DupeTrackerLastCheck < 2000)
+                if (Environment.TickCount - m_DupeTrackerLastCheck < 2000)
                     return;
 
-                m_DupeTrackerLastCheck = System.Environment.TickCount;
+                m_DupeTrackerLastCheck = Environment.TickCount;
 
                 Dictionary<uint, int> packs =
                     new Dictionary<uint, int>(m_DupeTracker);
@@ -673,7 +668,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 item.Packet = packet;
                 item.Incoming = false;
                 item.throttleType = 0;
-                item.TickCount = System.Environment.TickCount;
+                item.TickCount = Environment.TickCount;
                 item.Identifier = 0;
                 item.Resends = 0;
                 item.Length = packet.ToBytes().Length;
@@ -741,7 +736,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         m_UnackedBytes += item.Length;
 
                         // Keep track of when this packet was sent out
-                        item.TickCount = System.Environment.TickCount;
+                        item.TickCount = Environment.TickCount;
 
                         m_NeedAck[packet.Header.Sequence] = item;
                     }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 17c3f97..1c398d9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -27,23 +27,22 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
 using System.Timers;
+using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Statistics;
 using OpenSim.Framework.Statistics.Interfaces;
-using OpenSim.Region.ClientStack;
 using Timer=System.Timers.Timer;
 
-
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
     public class LLPacketQueue : IPullStatsProvider
     {
-        private static readonly log4net.ILog m_log
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// Is queueing enabled at all?
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index a42ae04..7305f34 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -27,12 +27,9 @@
 
 using System.Net;
 using System.Net.Sockets;
-using System.Reflection;
-using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index eb88715..7aea9a3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -31,11 +31,10 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
-using OpenMetaverse.Packets;
 using log4net;
 using Nini.Config;
+using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
@@ -304,7 +303,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // the next set of UDP data is for a valid client.         
                 ResetServerEndPoint(e);
             }
-            catch (System.ObjectDisposedException)
+            catch (ObjectDisposedException)
             {
                 m_log.Info("[UDPSERVER]: UDP Object disposed.   No need to worry about this if you're restarting the simulator.");
             }            
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
index d704967..ca26f5b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
@@ -26,7 +26,6 @@
  */
 
 using OpenMetaverse;
-using System;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {        
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index b2cf14c..1f564b7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -26,17 +26,13 @@
  */
 
 using System.Net;
-using System.Threading;
-using log4net;
+using log4net.Config;
 using Nini.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.ClientStack;
-using OpenSim.Region.ClientStack.LindenUDP;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
@@ -51,7 +47,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         {
             try
             {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
             }
             catch
             {
@@ -118,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             UseCircuitCodePacket uccp = new UseCircuitCodePacket();
             
             UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock 
-                = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock();
+                = new UseCircuitCodePacket.CircuitCodeBlock();
             uccpCcBlock.Code = circuitCode;
             uccpCcBlock.ID = agentId;
             uccpCcBlock.SessionID = sessionId;
@@ -169,7 +165,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             UseCircuitCodePacket uccp = new UseCircuitCodePacket();
             
             UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock 
-                = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock();
+                = new UseCircuitCodePacket.CircuitCodeBlock();
             uccpCcBlock.Code = myCircuitCode;
             uccpCcBlock.ID = myAgentUuid;
             uccpCcBlock.SessionID = mySessionUuid;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
index 90d7d63..d4e906a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Xml;
-using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
index d421f82..6e429a4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
@@ -25,14 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Threading;
 using Nini.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Region.ClientStack.LindenUDP;
 using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
index 507fe82..667014e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
@@ -26,9 +26,7 @@
  */
 
 using System.Collections.Generic;
-using OpenMetaverse;
 using OpenMetaverse.Packets;
-using OpenSim.Region.ClientStack.LindenUDP;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 { 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 91fadba..53506d3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -30,8 +30,6 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using OpenMetaverse.Packets;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 24ebd7e..55cf1ae 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -26,19 +26,16 @@
  */
 
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules;
 using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 4de4b2b..c8a540b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -25,14 +25,12 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-using System.Reflection;
 
+using System.Reflection;
 using log4net;
-
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.OGS1;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Scenes;
 
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 39e13d1..5feea4d 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -30,8 +30,8 @@
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.Local;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.Communications.Local;
 
 namespace OpenSim.Region.Communications.Hypergrid
 {
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index d93918d..72c0f42 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -31,30 +31,22 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
-using System.Threading;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
+using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
-// using OpenSim.Region.Environment.Modules.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
+// using OpenSim.Region.Environment.Modules.Framework;
 
 namespace OpenSim.Region.Communications.Hypergrid
 {
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index d1f416d..94646d2 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -29,18 +29,14 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-
+using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Framework.Scenes;
 
-using OpenMetaverse;
-
-using log4net;
-
 namespace OpenSim.Region.Communications.Hypergrid
 {
     public class HGGridServicesGridMode : HGGridServices
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 0f6b4c7..ea8ac2e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -25,6 +25,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  */
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -35,19 +36,15 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
-
+using log4net;
+using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Framework.Scenes;
 
-using OpenMetaverse;
-using Nwc.XmlRpc;
-using log4net;
-
 namespace OpenSim.Region.Communications.Hypergrid
 {
     public class HGGridServicesStandalone : HGGridServices
diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
index 874e8fb..8296910 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 084a9e9..e9eb18c 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -25,15 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
 using OpenMetaverse;
-using log4net;
-using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Communications.OGS1;
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 6a3b80d..5df3c34 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 5cb33cc..d4560be 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -27,8 +27,8 @@
 
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 5cd587d..3ad7249 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,8 +30,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index ca48814..d5305cc 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
@@ -36,11 +35,9 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
-using Nini.Config;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 0195a58..dd4d0aa 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -28,8 +28,8 @@
 using System;
 using System.Reflection;
 using System.Runtime.Remoting;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.Communications.OGS1
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index b9e8394..49d5938 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
index c690def..0f4c732 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 94a7a5c..b4b73b0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index 2be1eaa..3c24b05 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -25,13 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
 //using System.Reflection;
 //using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index b4dbaa1..0bf91e0 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -25,12 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
@@ -39,7 +40,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
     /// </summary>
     public class AgentAssetTransactions
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // Fields
         private bool m_dumpAssetsToFile;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 77dfd44..3fd4a70 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -27,8 +27,8 @@
 
 using System;
 using System.Collections.Generic;
-using OpenMetaverse;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index aef2664..9af764f 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -30,10 +30,8 @@ using System.IO;
 using System.Reflection;
 using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 4f7f177..6327466 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -32,11 +32,9 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 namespace OpenSim.Region.CoreModules.Agent.Capabilities
 {
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
index 107855d..4bfa18f 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -27,27 +27,29 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
-using OpenMetaverse;
+using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
 using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
 
 namespace OpenSim.Region.CoreModules.Agent.TextureDownload
 {
     public class TextureDownloadModule : IRegionModule
     {
-        private static readonly log4net.ILog m_log
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// There is one queue for all textures waiting to be sent, regardless of the requesting user.
         /// </summary>
-        private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_queueSenders
-            = new OpenSim.Framework.BlockingQueue<ITextureSender>();
+        private readonly BlockingQueue m_queueSenders
+            = new BlockingQueue();
 
         /// <summary>
         /// Each user has their own texture download service.
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
index 7309282..acc8c98 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -25,10 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Reflection;
-using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 675bb0f..2f98bab 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -27,8 +27,8 @@
 
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Limit;
 using OpenSim.Framework.Statistics;
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index df672b8..3a1d9a3 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -26,11 +26,10 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
-using System.Threading;
-using System.Collections.Generic;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
@@ -166,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         private void doJ2kDecode(UUID AssetId, byte[] j2kdata)
         {
             int DecodeTime = 0;
-            DecodeTime = System.Environment.TickCount;
+            DecodeTime = Environment.TickCount;
             OpenJPEG.J2KLayerInfo[] layers = new OpenJPEG.J2KLayerInfo[0]; // Dummy result for if it fails.  Informs that there's only full quality
 
             if (!OpenJpegFail)
@@ -198,7 +197,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                                
 
                                     // Write out decode time
-                                    m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", System.Environment.TickCount - DecodeTime,
+                                    m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", Environment.TickCount - DecodeTime,
                                                      AssetId);
                                
                             }
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
index df553ac..ec95187 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -26,12 +26,10 @@
  */
 
 using System;
-using System.Collections;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.CoreModules.Agent.TextureSender;
 using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.CoreModules.Agent.TextureSender
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
index b3ac624..dde8566 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
@@ -27,7 +27,6 @@
 
 using System;
 using System.Reflection;
-using OpenMetaverse.Packets;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index cb81c0d..1a2207f 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -27,8 +27,8 @@
 
 using System;
 using System.Collections.Generic;
-using OpenMetaverse;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index d084dbd..38b9dca 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -25,19 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
     public class AvatarFactoryModule : IAvatarFactory, IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index f036faf..323cb69 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -25,20 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Chat
 {
     public class ChatModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 1ed608a..f4dffb5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -25,22 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Xml;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
-
+using System;

+using System.Collections.Generic;

+using Nini.Config;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
 {
     public class CombatModule : IRegionModule
@@ -117,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
                             foundResult = true;
                         }
                     }
-                } catch (System.InvalidOperationException)
+                } catch (InvalidOperationException)
                 {
 
                 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 0a1de44..4ea9958 100644
--- a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -25,23 +25,23 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Xml;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Net;

+using System.Net.Sockets;

+using System.Reflection;

+using System.Xml;

+using log4net;

+using Nini.Config;

+using Nwc.XmlRpc;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 7326373..6dbc774 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -25,15 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System.Collections.Generic;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Dialog
 {
     public class DialogModule : IRegionModule, IDialogModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index fb4d08a..98683b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -25,20 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using Nwc.XmlRpc;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
     /*
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index a3a642f..d2bd803 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -25,16 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using System.Reflection;
-
+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Gestures
 {
     public class GesturesModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index 92d0fdd..4786cab 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -25,16 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Groups
 {
     public class GroupsModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 3ad2c91..7556388 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -24,21 +24,16 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Net;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Client;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
     public class InstantMessageModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 91c22eb..beff362 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -24,21 +24,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Net;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Net;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using Nwc.XmlRpc;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
     public class MessageTransferModule : IRegionModule, IMessageTransferModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index 49fd70a..3f41457 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -24,21 +24,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Net;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System.Collections;

+using System.Collections.Generic;

+using System.Net;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using Nwc.XmlRpc;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
     public class PresenceModule : IRegionModule, IPresenceModule
@@ -344,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
                 }
             }
-            catch (System.Net.WebException)
+            catch (WebException)
             {
                 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
             }
@@ -367,7 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
                 }
             }
-            catch (System.Net.WebException)
+            catch (WebException)
             {
                 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
             }
@@ -392,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
                 }
             }
-            catch (System.Net.WebException)
+            catch (WebException)
             {
                 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
             }
@@ -417,7 +414,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
                 }
             }
-            catch (System.Net.WebException)
+            catch (WebException)
             {
                 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index c5cffa3..5ae5b4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -25,22 +25,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Reflection;
-using System.Xml;
-using OpenMetaverse;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Archiver;
-using OpenSim.Region.CoreModules.World.Serialiser;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using log4net;
-
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.IO.Compression;

+using System.Reflection;

+using System.Text;

+using System.Xml;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Region.CoreModules.World.Archiver;

+

 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {
     public class InventoryArchiveReadRequest
@@ -48,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected TarArchiveReader archive;
-        private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+        private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
 
         private string m_firstName;
         private string m_lastName;
@@ -98,13 +96,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             item.ID = UUID.Parse(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("InvType");
-            item.InvType = System.Convert.ToInt32(reader.ReadString());
+            item.InvType = Convert.ToInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("CreatorUUID");
             item.Creator = UUID.Parse(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("CreationDate");
-            item.CreationDate = System.Convert.ToInt32(reader.ReadString());
+            item.CreationDate = Convert.ToInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("Owner");
             item.Owner = UUID.Parse(reader.ReadString());
@@ -121,37 +119,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 reader.ReadEndElement();
             }
             reader.ReadStartElement("AssetType");
-            item.AssetType = System.Convert.ToInt32(reader.ReadString());
+            item.AssetType = Convert.ToInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("AssetID");
             item.AssetID = UUID.Parse(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("SaleType");
-            item.SaleType = System.Convert.ToByte(reader.ReadString());
+            item.SaleType = Convert.ToByte(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("SalePrice");
-            item.SalePrice = System.Convert.ToInt32(reader.ReadString());
+            item.SalePrice = Convert.ToInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("BasePermissions");
-            item.BasePermissions = System.Convert.ToUInt32(reader.ReadString());
+            item.BasePermissions = Convert.ToUInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("CurrentPermissions");
-            item.CurrentPermissions = System.Convert.ToUInt32(reader.ReadString());
+            item.CurrentPermissions = Convert.ToUInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("EveryOnePermssions");
-            item.EveryOnePermissions = System.Convert.ToUInt32(reader.ReadString());
+            item.EveryOnePermissions = Convert.ToUInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("NextPermissions");
-            item.NextPermissions = System.Convert.ToUInt32(reader.ReadString());
+            item.NextPermissions = Convert.ToUInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("Flags");
-            item.Flags = System.Convert.ToUInt32(reader.ReadString());
+            item.Flags = Convert.ToUInt32(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("GroupID");
             item.GroupID = UUID.Parse(reader.ReadString());
             reader.ReadEndElement();
             reader.ReadStartElement("GroupOwned");
-            item.GroupOwned = System.Convert.ToBoolean(reader.ReadString());
+            item.GroupOwned = Convert.ToBoolean(reader.ReadString());
             reader.ReadEndElement();
             //reader.ReadStartElement("ParentFolderID");
             //item.Folder = UUID.Parse(reader.ReadString());
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index bfa4de9..da4785b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -25,20 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Reflection;
-using System.Xml;
-using OpenMetaverse;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Archiver;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using log4net;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.IO.Compression;

+using System.Reflection;

+using System.Xml;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Region.CoreModules.World.Archiver;

+

 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {        
     public class InventoryArchiveWriteRequest
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index a684b69..b025a31 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -25,17 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System.Collections.Generic;

+using System.IO;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {      
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d2cf6c9..98d952c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -25,18 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 {
     public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index ebf4f0a..c0e4b48 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -25,21 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Net;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Lure
 {
     public class LureModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index 193307d..ab65f8e 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,19 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-
+using System;

+using System.Collections;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.StructuredData;

+using OpenSim.Framework;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;

+

 namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
 {
     public class ObjectAdd : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index 6ea5b56..74e5b4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -25,16 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Globalization;
-using System.Reflection;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Globalization;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Profiles
 {
     public class AvatarProfilesModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 98536ed..ac40a17 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -24,20 +24,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */

-using System;

-using System.Collections;

 using System.Collections.Generic;

-using System.Net;

-using System.Net.Sockets;

 using System.Reflection;

-using System.Threading;

-using System.Xml;

-using OpenMetaverse;

 using log4net;

 using Nini.Config;

-using Nwc.XmlRpc;

+using OpenMetaverse;

 using OpenSim.Framework;

-using OpenSim.Framework.Communications.Cache;

 using OpenSim.Region.Framework.Interfaces;

 using OpenSim.Region.Framework.Scenes;

 

diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index 8a4bb09..3574b39 100644
--- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -24,29 +24,23 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Threading;
-using System.Xml;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Hypergrid;
-using OpenSim.Region.CoreModules.Communications.Local;
-
+using System;

+using System.Collections;

+using System.IO;

+using System.Net;

+using System.Reflection;

+using System.Text;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.StructuredData;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications;

+using OpenSim.Region.CoreModules.Communications.Local;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using OpenSim.Region.Framework.Scenes.Hypergrid;

+

 namespace OpenSim.Region.CoreModules.Communications.REST
 {
     public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
@@ -278,7 +272,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
             try
             {
                 strBuffer = OSDParser.SerializeJsonString(args);
-                System.Text.UTF8Encoding str = new System.Text.UTF8Encoding();
+                UTF8Encoding str = new UTF8Encoding();
                 buffer = str.GetBytes(strBuffer);
 
             }
@@ -363,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
             try
             {
                 strBuffer = OSDParser.SerializeJsonString(args);
-                System.Text.UTF8Encoding str = new System.Text.UTF8Encoding();
+                UTF8Encoding str = new UTF8Encoding();
                 buffer = str.GetBytes(strBuffer);
 
             }
@@ -509,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
             try
             {
                 strBuffer = OSDParser.SerializeJsonString(args);
-                System.Text.UTF8Encoding str = new System.Text.UTF8Encoding();
+                UTF8Encoding str = new UTF8Encoding();
                 buffer = str.GetBytes(strBuffer);
 
             }
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index e81466a..3999213 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -25,32 +25,23 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Threading;
-using System.Xml;
-using OpenMetaverse;
-using OpenMetaverse.Packets;
-using OpenMetaverse.StructuredData;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Net;

+using System.Reflection;

+using System.Threading;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Packets;

+using OpenMetaverse.StructuredData;

+using OpenSim.Framework;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;

+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 namespace OpenSim.Region.CoreModules.Framework.EventQueue
 {
@@ -326,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             m_scene.CommsManager.HttpServer.AddHTTPHandler(
                 capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
 
-            Random rnd = new Random(System.Environment.TickCount);
+            Random rnd = new Random(Environment.TickCount);
             lock (m_ids)
             {
                 if (!m_ids.ContainsKey(agentID))
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
index 80f6fce..5590516 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -25,12 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Net;
-using OpenMetaverse;
-using OpenMetaverse.Packets;
-using OpenMetaverse.StructuredData;
-
+using System;

+using System.Net;

+using OpenMetaverse;

+using OpenMetaverse.Packets;

+using OpenMetaverse.StructuredData;

+

 namespace OpenSim.Region.CoreModules.Framework.EventQueue
 {
     public class EventQueueHelper
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
index fe29e0c..11d13b9 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using OpenSim.Region.Framework.Interfaces;
-
+using System;

+using System.Collections.Generic;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
index cd905ab..d98a0f8 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
@@ -25,14 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using System.Text;

+using log4net;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 13efe6b..095c837 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -26,25 +26,19 @@
  *
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-
-using log4net;
-using Nini.Config;
-
-using OpenMetaverse;
-
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Grid.AssetServer;
-using OpenSim.Data;
-
+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Data;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Framework.Servers;

+using OpenSim.Grid.AssetServer;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Hypergrid
 {
     public class HGStandaloneAssetService : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
index dfc859e..bf88878 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
@@ -26,20 +26,18 @@
  * 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Hypergrid
 {
     public class HGStandaloneInventoryService : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 5540cc3..6c06fb1 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -27,36 +27,16 @@
  */
 
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using OpenMetaverse.StructuredData;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Types;
-using OpenSim.Region.CoreModules.World.WorldMap;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-
+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.CoreModules.World.WorldMap;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Hypergrid
 {
     public class HGWorldMapModule : WorldMapModule, IRegionModule
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 2e1675b..42a76bd 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -25,32 +25,27 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-using System.Reflection;
-using System.Threading;
-using System.Web;
-
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenMetaverse.Packets;
-
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Net;

+using System.Net.Security;

+using System.Reflection;

+using System.Security.Cryptography.X509Certificates;

+using System.Threading;

+using System.Web;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.StructuredData;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Capabilities;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;

+using OSDArray=OpenMetaverse.StructuredData.OSDArray;

+using OSDMap=OpenMetaverse.StructuredData.OSDMap;

+

 namespace OpenSim.Region.CoreModules.InterGrid
 {
     public struct OGPState
@@ -360,7 +355,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
 
         // Using OpenSim.Framework.Communications.Capabilities.Caps here one time..   
         // so the long name is probably better then a using statement
-        public void OnRegisterCaps(UUID agentID, OpenSim.Framework.Communications.Capabilities.Caps caps)
+        public void OnRegisterCaps(UUID agentID, Caps caps)
         {
             /* If we ever want to register our own caps here....    
              * 
@@ -558,7 +553,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
             string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez";
             string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez";
             // Get a reference to the user's cap so we can pull out the Caps Object Path
-            OpenSim.Framework.Communications.Capabilities.Caps userCap 
+            Caps userCap 
                 = homeScene.CapsModule.GetCapsHandlerForUser(agentData.AgentID);
 
             string rezHttpProtocol = "http://";
@@ -683,7 +678,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
                 if (homeScene != null)
                 {
                     // Get a referenceokay -  to their Cap object so we can pull out the capobjectroot
-                    OpenSim.Framework.Communications.Capabilities.Caps userCap 
+                    Caps userCap 
                         = homeScene.CapsModule.GetCapsHandlerForUser(userData.AgentID);
 
                     //Update the circuit data in the region so this user is authorized
@@ -889,7 +884,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
 
                     ShutdownConnection(LocalID,this);
                     // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS
-                    System.Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString());
+                    Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString());
                     return responseMap;
                 }
                 else
@@ -1202,7 +1197,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
 
         private string CreateRandomStr(int len)
         {
-            Random rnd = new Random(System.Environment.TickCount);
+            Random rnd = new Random(Environment.TickCount);
             string returnstring = "";
             string chars = "abcdefghijklmnopqrstuvwxyz0123456789";
 
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index e6a12a4..c62930c 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -25,17 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using System.Drawing;

+using System.Drawing.Imaging;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 {
     public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index c23ff1e..2e33d46 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -25,19 +25,18 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using log4net;
-using Nini.Config;
-using DotNetOpenMail;
-using DotNetOpenMail.SmtpAuth;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using System.Text.RegularExpressions;

+using DotNetOpenMail;

+using DotNetOpenMail.SmtpAuth;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Scripting.EmailModules
 {
     public class EmailModule : IEmailModule
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 9f3bd09..fdd2664 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -25,20 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Threading;
-using OpenMetaverse;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using System.Collections;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Net;

+using System.Text;

+using System.Threading;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 /*****************************************************
  *
  * ScriptsHttpRequests
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index afcaff1..a3e6543 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -25,16 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Drawing;
-using System.IO;
-using System.Net;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using Nini.Config;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Drawing;

+using System.IO;

+using System.Net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 {
     public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 0c709b5..c68d8bb 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -25,18 +25,18 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using Nini.Config;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Drawing;

+using System.Drawing.Imaging;

+using System.Globalization;

+using System.IO;

+using System.Net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 //using Cairo;
 
 namespace OpenSim.Region.CoreModules.Scripting.VectorRender
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index c363940..8e7a49f 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -25,15 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using OpenMetaverse;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 // using log4net;
 // using System.Reflection;
 
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 942c130..6476bcc 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -25,21 +25,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Reflection;

+using System.Threading;

+using log4net;

+using Nini.Config;

+using Nwc.XmlRpc;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 /*****************************************************
  *
  * XMLRPCModule
@@ -667,7 +666,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
                 if (resp != null)
                 {
                     Hashtable respParms;
-                    if (resp.Value.GetType().Equals(typeof(System.Collections.Hashtable)))
+                    if (resp.Value.GetType().Equals(typeof(Hashtable)))
                     {
                         respParms = (Hashtable) resp.Value;
                     }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
index 179d1a2..bc54eb6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
-using OpenMetaverse;
-
+using System.Collections.Generic;

+using OpenMetaverse;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 0cc1f86..3efb457 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,21 +25,21 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Reflection;
-using System.Xml;
-using System.Net;
-using OpenMetaverse;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Terrain;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.IO.Compression;

+using System.Net;

+using System.Reflection;

+using System.Text;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Region.CoreModules.World.Terrain;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+        private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
 
         private Scene m_scene;                        
         private Stream m_loadStream;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index d3c2cd1..c2ed257 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -25,19 +25,18 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Xml;
-using OpenMetaverse;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Serialiser;
-using OpenSim.Region.CoreModules.World.Terrain;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Reflection;

+using System.Xml;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.CoreModules.World.Terrain;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index ee0ec69..ba4d51b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -25,23 +25,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Serialiser;
-using OpenSim.Region.CoreModules.World.Terrain;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.IO.Compression;

+using System.Reflection;

+using System.Text.RegularExpressions;

+using System.Threading;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.CoreModules.World.Terrain;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index dd65e83..eeb5acd 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -25,18 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Serialiser;
-
+using System.IO;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index 76d27ce..5488262 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -25,14 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Xml;
-using OpenMetaverse;
-using log4net;
-using OpenSim.Framework;
-
+using System.Collections.Generic;

+using System.IO;

+using System.Reflection;

+using System.Xml;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index f9909d9..39d2591 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -25,16 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Xml;
-using OpenMetaverse;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Reflection;

+using System.Text;

+using System.Xml;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
 
         /// <summary>
         /// Store for asset data we received before we get the metadata
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 8971b6e..659a7ce 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,17 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using System.Threading;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
index 3e3e74a..94845cb 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
@@ -25,13 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.IO;
-using System.Text;
-using System.Xml;
-using OpenMetaverse;
-using OpenSim.Framework;
-
+using System.IO;

+using System.Text;

+using System.Xml;

+using OpenMetaverse;

+using OpenSim.Framework;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
index 506d770..983814d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,12 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using log4net;
-
+using System;

+using System.IO;

+using System.Text;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
index 437939e..8e59983 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
@@ -25,13 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Reflection;
-using log4net;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Text;

+

 namespace OpenSim.Region.CoreModules.World.Archiver
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index f201e74..1ad7e9e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -25,20 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.IO;
-using System.Threading;
-using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.World.Archiver;
-using OpenSim.Region.CoreModules.World.Serialiser;
-using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Tests.Common.Setup;
-
+using System;

+using System.IO;

+using System.Threading;

+using log4net.Config;

+using NUnit.Framework;

+using NUnit.Framework.SyntaxHelpers;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.CoreModules.World.Serialiser;

+using OpenSim.Region.CoreModules.World.Terrain;

+using OpenSim.Region.Framework.Scenes;

+using OpenSim.Tests.Common.Setup;

+

 namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 {
     [TestFixture]
@@ -222,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         [Test]
         public void TestMergeOarV0p2()
         {
-            log4net.Config.XmlConfigurator.Configure();
+            XmlConfigurator.Configure();
             
             MemoryStream archiveWriteStream = new MemoryStream();
 
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 8b15308..cc3db3f 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -24,17 +24,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using System.Threading;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Reflection;

+using System.Security;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.CoreModules.World.Terrain;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Estate
 {
     public class EstateManagementModule : IEstateModule
@@ -458,36 +460,36 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 TerrainUploader = null;
             }
             remoteClient.SendAlertMessage("Terrain Upload Complete. Loading....");
-            OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
+            ITerrainModule terr = m_scene.RequestModuleInterface<ITerrainModule>();
 
             if (terr != null)
             {
                 m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + m_scene.RegionInfo.RegionName);
-                if (System.IO.File.Exists(Util.dataDir() + "/terrain.raw"))
+                if (File.Exists(Util.dataDir() + "/terrain.raw"))
                 {
-                    System.IO.File.Delete(Util.dataDir() + "/terrain.raw");
+                    File.Delete(Util.dataDir() + "/terrain.raw");
                 }
                 try
                 {
-                    System.IO.FileStream input = new System.IO.FileStream(Util.dataDir() + "/terrain.raw", System.IO.FileMode.CreateNew);
+                    FileStream input = new FileStream(Util.dataDir() + "/terrain.raw", FileMode.CreateNew);
                     input.Write(terrainData, 0, terrainData.Length);
                     input.Close();
                 }
-                catch (System.IO.IOException e)
+                catch (IOException e)
                 {
                     m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools.  It gave us the following error: {0}", e.ToString());
                     remoteClient.SendAlertMessage("There was an IO Exception loading your terrain.  Please check free space");
 
                     return;
                 }
-                catch (System.Security.SecurityException e)
+                catch (SecurityException e)
                 {
                     m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools.  It gave us the following error: {0}", e.ToString());
                     remoteClient.SendAlertMessage("There was a security Exception loading your terrain.  Please check the security on the simulator drive");
 
                     return;
                 }
-                catch (System.UnauthorizedAccessException e)
+                catch (UnauthorizedAccessException e)
                 {
                     m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools.  It gave us the following error: {0}", e.ToString());
                     remoteClient.SendAlertMessage("There was a security Exception loading your terrain.  Please check the security on the simulator drive");
@@ -544,18 +546,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private void handleTerrainRequest(IClientAPI remote_client, string clientFileName)
         {
             // Save terrain here
-            OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
+            ITerrainModule terr = m_scene.RequestModuleInterface<ITerrainModule>();
             
             if (terr != null)
             {
                 m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + m_scene.RegionInfo.RegionName);
-                if (System.IO.File.Exists(Util.dataDir() + "/terrain.raw"))
+                if (File.Exists(Util.dataDir() + "/terrain.raw"))
                 {
-                    System.IO.File.Delete(Util.dataDir() + "/terrain.raw");
+                    File.Delete(Util.dataDir() + "/terrain.raw");
                 }
                 terr.SaveToFile(Util.dataDir() + "/terrain.raw");
 
-                System.IO.FileStream input = new System.IO.FileStream(Util.dataDir() + "/terrain.raw", System.IO.FileMode.Open);
+                FileStream input = new FileStream(Util.dataDir() + "/terrain.raw", FileMode.Open);
                 byte[] bdata = new byte[input.Length];
                 input.Read(bdata, 0, (int)input.Length);
                 remote_client.SendAlertMessage("Terrain file written, starting download...");
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
index 94a4072..309a7ae 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
@@ -25,16 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.IO;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Scenes;
-
-
+using System;

+using OpenMetaverse;

+using OpenSim.Framework;

+

 namespace OpenSim.Region.CoreModules.World.Estate
 {
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 41163a0..98d4076 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,13 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System.Collections.Generic;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Land
 {
     public class LandChannel : ILandChannel
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 6ae6576..3ee2267 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,21 +25,21 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Region.Physics.Manager;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Capabilities;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using OpenSim.Region.Physics.Manager;

+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;

+

 namespace OpenSim.Region.CoreModules.World.Land
 {
     // used for caching
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index fc5bef1..8775a85 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,15 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenMetaverse;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Land
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 6e0f8cb..d970579 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -25,20 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenMetaverse;
-using Nini.Config;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using OpenSim;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.Framework;
-using OpenSim.Framework.Communications.Cache;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Cache;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Permissions
 {
     public class PermissionsModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
index acc7bb8..ef60dd0 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Scenes;
-
+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
     internal interface IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index ed6448f..76ae9f0 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -25,13 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Text;
-using System.Xml;
-using OpenSim.Region.Framework.Scenes;
-
+using System.Collections.Generic;

+using System.IO;

+using System.IO.Compression;

+using System.Text;

+using System.Xml;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
     internal class SerialiseObjects : IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
index 924218a..47b8d36 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
-using OpenSim.Region.Framework.Scenes;
-
+using OpenSim.Region.CoreModules.World.Terrain;

+using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
     internal class SerialiseTerrain : IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index 7080d5f..d687e23 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -25,15 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using OpenMetaverse;
-using Nini.Config;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
     public class SerialiserModule : IRegionModule, IRegionSerialiserModule
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index ffd6b8d..c9333c7 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -25,15 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Reflection;
-using Nini.Config;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Sound
 {        
     public class SoundModule : IRegionModule, ISoundModule
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index b36684c..060fda6 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -25,20 +25,22 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules
 {
     public class SunModule : IRegionModule
     {
 
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private const double SeasonalTilt   =  0.03 * Math.PI;  // A daily shift of approximately 1.7188 degrees
         private const double AverageTilt    = -0.25 * Math.PI;  // A 45 degree tilt
@@ -104,7 +106,7 @@ namespace OpenSim.Region.CoreModules
         private ulong CurrentTime
         {
             get {
-                return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset + LindenHourOffset)/10000000);
+                return (ulong)(((DateTime.Now.Ticks) - TicksToEpoch + TicksOffset + LindenHourOffset)/10000000);
             }
         }
 
@@ -161,7 +163,7 @@ namespace OpenSim.Region.CoreModules
 
             // Align ticks with Second Life
 
-            TicksToEpoch = new System.DateTime(1970,1,1).Ticks;
+            TicksToEpoch = new DateTime(1970,1,1).Ticks;
 
             // Just in case they don't have the stanzas
             try
diff --git a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
index f96ab88..cf38bca 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
-
+using System;

+using OpenSim.Region.CoreModules.World.Terrain;

+using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects
 {
     public class ChannelDigger : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
index cb8112c..20c25d3 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -24,11 +24,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
-
+using System;

+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 {
     internal class CookieCutter : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
index da6ee12..e21466c 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -24,10 +24,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 {
     internal class DefaultTerrainGenerator : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
index 4f395b5..630d5a0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-
+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
index cff82d1..704386f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-
+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     internal class GIF : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 477c73c..f4d1c76 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,13 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index f8e31f8..44afed1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -25,12 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-
+using System;

+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     public class JPEG : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index a86ae00..7dbcc50 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     public class LLRAW : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
index 0dea282..5a00525 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-
+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     internal class PNG : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
index 178104f..d54f529 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     public class RAW32 : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
index 220431f..3233ab6 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-
+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     internal class TIFF : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 426708d..82108da 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -25,12 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.IO;
-using System.Text;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.IO;

+using System.Text;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
index fe79c0b..feef3df 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-
+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class FlattenArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
index 5c0aace..f91ddf2 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-
+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class LowerArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
index 02f2b53..599951d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class NoiseArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
index 768b31f..4eaae4b 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-
+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class RaiseArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
index 66b9055..2c31ca9 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-
+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class RevertArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
index a75dde1..3c44fb0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-
+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
     public class SmoothArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
index 40b9f5a..b6edde1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-
+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
index eee7a83..41f31f8 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Region.Framework.Interfaces;
-
+using System;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
index c62b897..4cee9f5 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.IO;
-using OpenSim.Region.Framework.Interfaces;
-
+using System.IO;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
index 8c5d1d9..807a4a7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
@@ -26,10 +26,9 @@
  */
 
 
-using System.IO;
-using OpenMetaverse;
-using OpenSim.Framework;
-
+using System.IO;

+using OpenMetaverse;

+

 namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainModule
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
index 15d9f6e..8e4ffe0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-
+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 6ce6994..10d015f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 928a595..d6a3b8e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class FlattenSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
index 8c40088..407fd89 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Region.Framework.Interfaces;
-
+using System;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class LowerSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
index 95a8c33..34f5d94 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -25,11 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class NoiseSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
index 1a2528a..1207723 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
index c53bb7d..7df751f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -25,10 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using OpenSim.Region.Framework.Interfaces;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class RaiseSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
index 4ed8a13..b156565 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -25,10 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class RevertSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 6636d8f..346e5de 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     public class SmoothSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
index 6b00cc8..33970be 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
     /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
index ff9b8ec..1769dc0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-
+using System;

+

 namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public class TerrainException : Exception
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 9de7338..8aa8ecc 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -25,21 +25,21 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
-using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
-using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
-using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
-
+using System;

+using System.Collections.Generic;

+using System.IO;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;

+using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;

+using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;

+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
index e7f92d7..eea4ed4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using NUnit.Framework;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
-
+using System;

+using NUnit.Framework;

+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.Terrain.Tests
 {
     [TestFixture]
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index 8b2bb1e..e9d1dc3 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -25,17 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.Avatar.Vegetation
 {
     public class VegetationModule : IRegionModule, IVegetationModule
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index b8bd605..ebc7e00 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -25,14 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Collections.Generic;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules
 {
     public class WindModule : IWindModule
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules
 
         private int m_frame = 0;
         private int m_frame_mod = 150;
-        private Random rndnums = new Random(System.Environment.TickCount);
+        private Random rndnums = new Random(Environment.TickCount);
         private Scene m_scene = null;
         private bool ready = false;
         private Vector2[] windSpeeds = new Vector2[16 * 16];
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
index 3684df0..eaf43d3 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Drawing;
-using OpenSim.Region.Framework.Scenes;
-using Nini.Config;
-
+using System.Drawing;

+using Nini.Config;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public interface IMapTileTerrainRenderer
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index eea6cf6..188915d 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -25,20 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Reflection;
-using Nini.Config;
-using OpenMetaverse.Imaging;
-using log4net;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-
+using System;

+using System.Collections.Generic;

+using System.Drawing;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public enum DrawRoutine
@@ -208,7 +205,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             int tc = 0;
             double[,] hm = whichScene.Heightmap.GetDoubles();
-            tc = System.Environment.TickCount;
+            tc = Environment.TickCount;
             m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
             List<EntityBase> objs = whichScene.GetEntities();
             Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
@@ -525,7 +522,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 g.Dispose();
             } // lock entities objs
 
-            m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (System.Environment.TickCount - tc) + " ms");
+            m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
             return mapbmp;
         }
 
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 45a99a9..bd7e140 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -24,18 +24,16 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-using System.Net;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Hypergrid;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-
+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using OpenSim.Region.Framework.Scenes.Hypergrid;

+

 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public class MapSearchModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
index b783d7c..501c826 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
@@ -25,20 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Reflection;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using Nini.Config;
-using log4net;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Drawing;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public class ShadedMapTileRenderer : IMapTileTerrainRenderer
@@ -57,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         public void TerrainToBitmap(Bitmap mapbmp)
         {
-            int tc = System.Environment.TickCount;
+            int tc = Environment.TickCount;
             m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
 
             double[,] hm = m_scene.Heightmap.GetDoubles();
@@ -151,7 +144,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                         hfdiffihighlight = hfdiffihighlight + Math.Abs((int)(((hfdiff * highlightfactor) % 1f) * 5f) - 1);
                                     }
                                 }
-                                catch (System.OverflowException)
+                                catch (OverflowException)
                                 {
                                     m_log.Debug("[MAPTILE]: Shadow failed at value: " + hfdiff.ToString());
                                     ShadowDebugContinue = false;
@@ -199,7 +192,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                 }
                             }
                         }
-                        catch (System.ArgumentException)
+                        catch (ArgumentException)
                         {
                             if (!terraincorruptedwarningsaid)
                             {
@@ -230,7 +223,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                             Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255);
                             mapbmp.SetPixel(x, yr, water);
                         }
-                        catch (System.ArgumentException)
+                        catch (ArgumentException)
                         {
                             if (!terraincorruptedwarningsaid)
                             {
@@ -243,7 +236,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     }
                 }
             }
-            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
+            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
index 537644a..dc59d9e 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -25,22 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Reflection;
-using OpenMetaverse;
-using Nini.Config;
-using log4net;
-using OpenMetaverse.Imaging;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Terrain;
-
+using System;

+using System.Collections.Generic;

+using System.Drawing;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Scenes;

+

 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     // Hue, Saturation, Value; used for color-interpolation
@@ -269,7 +264,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         public void TerrainToBitmap(Bitmap mapbmp)
         {
-            int tc = System.Environment.TickCount;
+            int tc = Environment.TickCount;
             m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
 
             // These textures should be in the AssetCache anyway, as every client conneting to this
@@ -405,7 +400,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     }
                 }
             }
-            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
+            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 376e365..b372988 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -25,33 +25,29 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using OpenMetaverse.StructuredData;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Types;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+using System.Net;

+using System.Reflection;

+using System.Threading;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenMetaverse.StructuredData;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Capabilities;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;

+using OSDArray=OpenMetaverse.StructuredData.OSDArray;

+using OSDMap=OpenMetaverse.StructuredData.OSDMap;

+

 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
     public class WorldMapModule : IRegionModule
@@ -329,7 +325,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 {    
                     // Local Map Item Request
                     List<ScenePresence> avatars = m_scene.GetAvatars();
-                    int tc = System.Environment.TickCount;
+                    int tc = Environment.TickCount;
                     List<mapItemReply> mapitems = new List<mapItemReply>();
                     mapItemReply mapitem = new mapItemReply();
                     if (avatars.Count == 0 || avatars.Count == 1)
@@ -554,7 +550,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     lock (m_blacklistedregions)
                     {
                         if (!m_blacklistedregions.ContainsKey(regionhandle))
-                            m_blacklistedregions.Add(regionhandle, System.Environment.TickCount);
+                            m_blacklistedregions.Add(regionhandle, Environment.TickCount);
                     }
                     m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString());
                 }
@@ -610,7 +606,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 lock (m_blacklistedurls)
                 {
                     if (!m_blacklistedurls.ContainsKey(httpserver))
-                        m_blacklistedurls.Add(httpserver, System.Environment.TickCount);
+                        m_blacklistedurls.Add(httpserver, Environment.TickCount);
                 }
 
                 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
@@ -639,7 +635,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     lock (m_blacklistedurls)
                     {
                         if (!m_blacklistedurls.ContainsKey(httpserver))
-                            m_blacklistedurls.Add(httpserver, System.Environment.TickCount);
+                            m_blacklistedurls.Add(httpserver, Environment.TickCount);
                     }
 
                     m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
@@ -804,7 +800,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             List<ScenePresence> avatars = m_scene.GetAvatars();
             OSDArray responsearr = new OSDArray(avatars.Count);
             OSDMap responsemapdata = new OSDMap();
-            int tc = System.Environment.TickCount;
+            int tc = Environment.TickCount;
             /* 
             foreach (ScenePresence av in avatars)
             {
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 9af8914..82b3826 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -26,16 +26,15 @@
 *
 */
 
-using System;
 using System.Collections;
 using System.Reflection;
 using System.Xml;
 using log4net;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Capabilities;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 using OpenMetaverse;
+using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Scenes;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 namespace OpenSim.Region.DataSnapshot
 {
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 735e14b..3013971 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -31,17 +31,15 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Reflection;
-using System.Text;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse.Packets;
 
 namespace OpenSim.Region.DataSnapshot
 {
@@ -51,7 +49,7 @@ namespace OpenSim.Region.DataSnapshot
         //Information from config
         private bool m_enabled = false;
         private bool m_configLoaded = false;
-        private List<String> m_disabledModules = new List<String>();
+        private List<string> m_disabledModules = new List<string>();
         private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>();
         private string m_snapsDir = "DataSnapshot";
         private string m_exposure_level = "minimum";
@@ -123,7 +121,7 @@ namespace OpenSim.Region.DataSnapshot
                         {
                             m_disabledModules.Add(bloody_wanker);
                         }
-                        m_lastUpdate = System.Environment.TickCount;
+                        m_lastUpdate = Environment.TickCount;
                     }
                     catch (Exception)
                     {
@@ -363,26 +361,26 @@ namespace OpenSim.Region.DataSnapshot
         private void CheckStale()
         {
             // Wrap check
-            if (System.Environment.TickCount < m_lastUpdate)
+            if (Environment.TickCount < m_lastUpdate)
             {
-                m_lastUpdate = System.Environment.TickCount;
+                m_lastUpdate = Environment.TickCount;
             }
 
             if (m_stales >= m_maxStales)
             {
-                if (System.Environment.TickCount - m_lastUpdate >= 20000)
+                if (Environment.TickCount - m_lastUpdate >= 20000)
                 {
                     m_stales = 0;
-                    m_lastUpdate = System.Environment.TickCount;
+                    m_lastUpdate = Environment.TickCount;
                     MakeEverythingStale();
                 }
             }
             else
             {
-                if (m_lastUpdate + 1000 * m_period < System.Environment.TickCount)
+                if (m_lastUpdate + 1000 * m_period < Environment.TickCount)
                 {
                     m_stales = 0;
-                    m_lastUpdate = System.Environment.TickCount;
+                    m_lastUpdate = Environment.TickCount;
                     MakeEverythingStale();
                 }
             }
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
index e805e5b..36f93a3 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Xml;
 
 namespace OpenSim.Region.DataSnapshot.Interfaces
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
index 73e41ee..6c66922 100644
--- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
+++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
@@ -25,7 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-using System;
 using OpenSim.Framework.Communications.Capabilities;
 
 namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 52659e4..fea9f9b 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -29,15 +29,14 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse.Packets;
-using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Region.DataSnapshot.Providers
 {
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 949cc38..7cca6ad 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -30,12 +30,11 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
 using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Land;
-using OpenSim.Framework;
-using OpenMetaverse;
 
 namespace OpenSim.Region.DataSnapshot.Providers
 {
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index 22fe067..9886995 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -27,12 +27,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Xml;
-using System.IO;
-using OpenSim.Region.Framework.Scenes;
+using log4net;
 using OpenSim.Region.DataSnapshot.Interfaces;
-using OpenMetaverse;
+using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.DataSnapshot
 {
@@ -42,7 +43,7 @@ namespace OpenSim.Region.DataSnapshot
         private String m_directory = "unyuu"; //not an attempt at adding RM references to core SVN, honest
         private Dictionary<Scene, bool> m_scenes = null;
         private List<IDataSnapshotProvider> m_providers = null;
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private Dictionary<String, String> m_gridinfo = null;
         private bool m_cacheEnabled = true;
         private string m_listener_port = "9000"; //TODO: Set default port over 9000
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 6c9cf2c..90269cf 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -26,9 +26,8 @@
  */
 
 using System.Collections.Generic;
-using System.IO;
-using OpenMetaverse;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index 49a5dd0..b41ba9e 100644
--- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -27,7 +27,6 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
index b533206..d39fff9 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
@@ -27,7 +27,6 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
index bac0b2e..ddc62d2 100644
--- a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
@@ -25,11 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index 7247d52..d6f3340 100644
--- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using OpenMetaverse;
 using OpenSim.Framework;
 
diff --git a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
index b5f885a..f06fbc8 100644
--- a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 20fe090..69b2bad 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -25,15 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Reflection;
 using OpenMetaverse;
-using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes.Scripting;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
index 4da115e..faa9002 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
@@ -25,9 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index f169f61..59f68ef 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index cf609ae..b8874e3 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -25,14 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Net;
-using OpenSim.Framework;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenMetaverse.StructuredData;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
index 16527d1..67c88dd 100644
--- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
@@ -25,10 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-using OpenSim.Framework;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index fd49757..e552270 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Net;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index bfa17fc..06ef1aa 100644
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -25,9 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
index 0e1e851..f68807a 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.IO;
-
+using System.IO;

+

 namespace OpenSim.Region.Framework.Interfaces
 {        
     public interface IInventoryArchiverModule
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
index 4314271..716d7a8 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 35c2fc1..341dd3e 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -28,7 +28,6 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
index f0a5473..ffae307 100644
--- a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using OpenSim.Framework;
-using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
index 011f8bb..85bc4da 100644
--- a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index 40e4c99..02174f8 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -25,9 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenMetaverse;
 using System.Collections.Generic;
 using System.IO;
+using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
index 79a43d6..c713cc3 100644
--- a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
@@ -1,4 +1,3 @@
-using System;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 65620d3..6ba0068 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 91c80e3..078139d 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -26,7 +26,6 @@
  */
 
 using System;
-using Nini.Config;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
index 96b303f..5b8b0ce 100644
--- a/OpenSim/Region/Framework/Interfaces/IWindModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
index cdd2b7c..d6f9819 100644
--- a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
@@ -26,7 +26,6 @@
  */
 
 using OpenMetaverse;
-using Nwc.XmlRpc;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Scenes/Animation.cs b/OpenSim/Region/Framework/Scenes/Animation.cs
index 3504717..cb0afa7 100644
--- a/OpenSim/Region/Framework/Scenes/Animation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
index f53bb78..49bcda8 100644
--- a/OpenSim/Region/Framework/Scenes/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 178f1f7..7f2ac63 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -31,7 +31,6 @@ using System.Reflection;
 using System.Timers;
 using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index a322766..504b90a 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -32,7 +32,6 @@ using System.Reflection;
 using log4net;
 using OpenMetaverse;
 
-
 namespace OpenSim.Region.Framework.Scenes
 {
     public class EntityManager : IEnumerable<EntityBase>
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 23e1278..9d47f87 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -26,13 +26,12 @@
  */
 
 using System;
+using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-using System.Collections.Generic;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 namespace OpenSim.Region.Framework.Scenes
 {
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index cc82a48..4039288 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -27,20 +27,13 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
-
 using log4net;
-using Nini.Config;
 using OpenMetaverse;
-
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Scenes;
 
 //using HyperGrid.Framework;
 //using OpenSim.Region.Communications.Hypergrid;
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
index 7249029..ad98273 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
@@ -26,13 +26,11 @@
  */
 
 using System;
-using System.Reflection;
 using System.Net;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenMetaverse;
+using System.Reflection;
 using log4net;
-using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index c6d2bfc..ea03cf9 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -26,21 +26,13 @@
  * 
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
-
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
-
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index 1cb98db..558dfb4 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -26,15 +26,9 @@
  * 
  */
 
-using System;
-using System.Collections.Generic;
-
 using OpenMetaverse;
-
 using OpenSim.Framework;
-
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Scenes;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index a17df71..f75ea8e 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -33,12 +33,10 @@ using System.Reflection;
 using System.Threading;
 using log4net;
 using OpenMetaverse;
-using OSD = OpenMetaverse.StructuredData.OSD;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 848b497..e2eb89e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -30,26 +30,22 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Xml;
+using System.Text;
 using System.Threading;
 using System.Timers;
+using System.Xml;
+using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
-using Nini.Config;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-using Image = System.Drawing.Image;
+using Timer=System.Timers.Timer;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
-using Timer = System.Timers.Timer;
-using OSD = OpenMetaverse.StructuredData.OSD;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -776,7 +772,7 @@ namespace OpenSim.Region.Framework.Scenes
             int maintc = 0;
             while (!shuttingdown)
             {
-                maintc = System.Environment.TickCount;
+                maintc = Environment.TickCount;
 
                 TimeSpan SinceLastFrame = DateTime.Now - m_lastupdate;
                 // Aquire a lock so only one update call happens at once
@@ -802,7 +798,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                frameMS = System.Environment.TickCount;
+                frameMS = Environment.TickCount;
                 try
                 {
                     // Increment the frame counter
@@ -812,15 +808,15 @@ namespace OpenSim.Region.Framework.Scenes
                     if (m_frame == Int32.MaxValue)
                         m_frame = 0;
 
-                    physicsMS2 = System.Environment.TickCount;
+                    physicsMS2 = Environment.TickCount;
                     if ((m_frame % m_update_physics == 0) && m_physics_enabled)
                         m_sceneGraph.UpdatePreparePhysics();
-                    physicsMS2 = System.Environment.TickCount - physicsMS2;
+                    physicsMS2 = Environment.TickCount - physicsMS2;
 
                     if (m_frame % m_update_entitymovement == 0)
                         m_sceneGraph.UpdateEntityMovement();
 
-                    physicsMS = System.Environment.TickCount;
+                    physicsMS = Environment.TickCount;
                     if ((m_frame % m_update_physics == 0) && m_physics_enabled)
                         physicsFPS = m_sceneGraph.UpdatePhysics(
                             Math.Max(SinceLastFrame.TotalSeconds, m_timespan)
@@ -828,10 +824,10 @@ namespace OpenSim.Region.Framework.Scenes
                     if (m_frame % m_update_physics == 0 && SynchronizeScene != null)
                         SynchronizeScene(this);
 
-                    physicsMS = System.Environment.TickCount - physicsMS;
+                    physicsMS = Environment.TickCount - physicsMS;
                     physicsMS += physicsMS2;
 
-                    otherMS = System.Environment.TickCount;
+                    otherMS = Environment.TickCount;
                     // run through all entities looking for updates (slow)
                     if (m_frame % m_update_entities == 0)
                         m_sceneGraph.UpdateEntities();
@@ -864,7 +860,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                         if (m_frame % m_update_land == 0)
                             UpdateLand();
-                        otherMS = System.Environment.TickCount - otherMS;
+                        otherMS = Environment.TickCount - otherMS;
                         // if (m_frame%m_update_avatars == 0)
                         //   UpdateInWorldTime();
                         StatsReporter.AddPhysicsFPS(physicsFPS);
@@ -875,7 +871,7 @@ namespace OpenSim.Region.Framework.Scenes
                         StatsReporter.SetChildAgents(m_sceneGraph.GetChildAgentCount());
                         StatsReporter.SetObjects(m_sceneGraph.GetTotalObjectsCount());
                         StatsReporter.SetActiveObjects(m_sceneGraph.GetActiveObjectsCount());
-                        frameMS = System.Environment.TickCount - frameMS;
+                        frameMS = Environment.TickCount - frameMS;
                         StatsReporter.addFrameMS(frameMS);
                         StatsReporter.addPhysicsMS(physicsMS);
                         StatsReporter.addOtherMS(otherMS);
@@ -919,7 +915,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     m_lastupdate = DateTime.Now;
                 }
-                maintc = System.Environment.TickCount - maintc;
+                maintc = Environment.TickCount - maintc;
                 maintc = (int)(m_timespan * 1000) - maintc;
 
                 if ((maintc < (m_timespan * 1000)) && maintc > 0)
@@ -1184,7 +1180,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 #region Fallback default maptile generation
 
-                int tc = System.Environment.TickCount;
+                int tc = Environment.TickCount;
                 m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
                 Bitmap mapbmp = new Bitmap(256, 256);
                 double[,] hm = Heightmap.GetDoubles();
@@ -1301,7 +1297,7 @@ namespace OpenSim.Region.Framework.Scenes
                                                 hfdiffi = hfdiffi + Math.Abs((int)(((hfdiff % 1) * 0.5f) * 10f) - 1);
                                             }
                                         }
-                                        catch (System.OverflowException)
+                                        catch (OverflowException)
                                         {
                                             m_log.Debug("[MAPTILE]: Shadow failed at value: " + hfdiff.ToString());
                                             ShadowDebugContinue = false;
@@ -1325,7 +1321,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     }
                                 }
                             }
-                            catch (System.ArgumentException)
+                            catch (ArgumentException)
                             {
                                 if (!terraincorruptedwarningsaid)
                                 {
@@ -1361,7 +1357,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255);
                                 mapbmp.SetPixel(x, (256 - y) - 1, water);
                             }
-                            catch (System.ArgumentException)
+                            catch (ArgumentException)
                             {
                                 if (!terraincorruptedwarningsaid)
                                 {
@@ -1379,7 +1375,7 @@ namespace OpenSim.Region.Framework.Scenes
                     //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms");
                 }
 
-                m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
+                m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
 
                 bool drawPrimVolume = true;
 
@@ -1395,7 +1391,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (drawPrimVolume)
                 {
-                    tc = System.Environment.TickCount;
+                    tc = Environment.TickCount;
                     m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
                     List<EntityBase> objs = GetEntities();
 
@@ -1547,7 +1543,7 @@ namespace OpenSim.Region.Framework.Scenes
                         } // foreach loop over entities
                     } // lock entities objs
 
-                    m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (System.Environment.TickCount - tc) + " ms");
+                    m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
                 } // end if drawPrimOnMaptle
 
                 byte[] data;
@@ -2146,7 +2142,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     string spath = Path.Combine("ScriptEngines", RegionInfo.RegionID.ToString());
                                     spath = Path.Combine(spath, uuid.ToString());
                                     FileStream sfs = File.Create(spath + ".state");
-                                    System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+                                    ASCIIEncoding enc = new ASCIIEncoding();
                                     Byte[] buf = enc.GetBytes(sdoc.InnerXml);
                                     sfs.Write(buf, 0, buf.Length);
                                     sfs.Close();
@@ -2350,7 +2346,7 @@ namespace OpenSim.Region.Framework.Scenes
                 CreateAndAddScenePresence(client);
             }
 
-            m_LastLogin = System.Environment.TickCount;
+            m_LastLogin = Environment.TickCount;
             EventManager.TriggerOnNewClient(client);
         }
 
@@ -2891,7 +2887,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_sceneGridService.SendCloseChildAgentConnections(loggingOffUser.UUID, new List<ulong>(loggingOffUser.KnownRegions.Keys));
                     loggingOffUser.ControllingClient.Kick(message);
                     // Give them a second to receive the message!
-                    System.Threading.Thread.Sleep(1000);
+                    Thread.Sleep(1000);
                     loggingOffUser.ControllingClient.Close(true);
                 }
                 else
@@ -4157,7 +4153,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // A login in the last 4 mins? We can't be doing too badly
             //
-            if ((System.Environment.TickCount - m_LastLogin) < 240000)
+            if ((Environment.TickCount - m_LastLogin) < 240000)
                 health++;
 
             return 0;