diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 2819bc9daf..4c9b19da91 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -756,7 +756,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                         using (MemoryStream memoryStream = new MemoryStream())
                         {
                             streamHandler.Handle(path, request.InputStream, memoryStream, request, response);
-                            memoryStream.Flush();
                             buffer = memoryStream.ToArray();
                         }
                     }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
index a107ced52f..b26321b682 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
@@ -301,8 +301,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// </summary>
         public void Send()
         {
-            _httpResponse.Body.Flush();
-
             _httpResponse.Send();
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index 4fd69f3de0..4ea7692e0c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -96,7 +96,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             try
             {
                 response.OutputStream.Write(buffer, 0, buffer.Length);
-                response.OutputStream.Flush();
                 response.Send();
                 buffer = null;
             }
@@ -123,7 +122,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             if(Request.Body.CanRead)
                 Request.Body.Dispose();
 
-            response.SendChunked = false;
             response.ContentLength64 = 0;
             response.ContentEncoding = Encoding.UTF8;
             response.KeepAlive = false;
@@ -132,7 +130,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             try
             {
-                response.OutputStream.Flush();
                 response.Send();
             }
             catch
@@ -140,20 +137,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
     }
-
-    class PollServiceHttpRequestComparer : IEqualityComparer<PollServiceHttpRequest>
-    {
-        public bool Equals(PollServiceHttpRequest b1, PollServiceHttpRequest b2)
-        {
-            if (b1.contextHash != b2.contextHash)
-                return false;
-            bool b = Object.ReferenceEquals(b1.HttpContext, b2.HttpContext);
-            return b;
-        }
-
-        public int GetHashCode(PollServiceHttpRequest b2)
-        {
-            return (int)b2.contextHash;
-        }
-    }
-}
+}
\ No newline at end of file