diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 55cafbd064..d2338a35ff 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -794,19 +794,16 @@ namespace OpenSim.Framework
 
             request.Method = verb;
 
-            MemoryStream buffer = null;
             byte[] data = null;
-
             try
             {
                 if (verb == "POST")
                 {
                     request.ContentType = "text/xml";
 
-                    buffer = new MemoryStream();
-
                     XmlWriterSettings settings = new XmlWriterSettings();
                     settings.Encoding = Encoding.UTF8;
+                    using (MemoryStream buffer = new MemoryStream())
                     using (XmlWriter writer = XmlWriter.Create(buffer, settings))
                     {
                         XmlSerializer serializer = new XmlSerializer(type);
@@ -947,11 +944,7 @@ namespace OpenSim.Framework
                         reqnum, tickdiff, tickdata);
                 }
             }
-            finally
-            {
-                if (buffer != null && buffer.CanRead)
-                    buffer.Dispose();
-            }
+            catch { }
         }
     }
 
@@ -1010,7 +1003,7 @@ namespace OpenSim.Framework
                 try
                 {
                     using(Stream requestStream = request.GetRequestStream())
-                        requestStream.Write(data,0,length);
+                        requestStream.Write(data, 0, length);
                 }
                 catch (Exception e)
                 {
@@ -1276,8 +1269,8 @@ namespace OpenSim.Framework
                     request.ContentType = "text/xml";
 
                     byte[] data;
-                    XmlWriterSettings settings = new XmlWriterSettings(){CloseOutput = true, Encoding = Util.UTF8};
-                    MemoryStream ms = new MemoryStream();
+                    XmlWriterSettings settings = new XmlWriterSettings(){Encoding = Util.UTF8};
+                    using (MemoryStream ms = new MemoryStream())
                     using (XmlWriter writer = XmlWriter.Create(ms, settings))
                     {
                         XmlSerializer serializer = new XmlSerializer(type);
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index b279484aa2..37b7971303 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -180,8 +180,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
                 flags |= RegionFlags.ResetHomeOnTeleport;
 
-            if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
-                flags |= RegionFlags.AllowEnvironmentOverride;
 
             // TODO: SkipUpdateInterestList
 
@@ -426,8 +424,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             //uint sun = 0;
 
-            //if (Scene.RegionInfo.EstateSettings.FixedSun)
-            //    sun = (uint)(Scene.RegionInfo.EstateSettings.SunPosition * 1024.0) + 0x1800;
             UUID estateOwner;
             estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner;