diff --git a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
index dac4ca85dc..2b977b138d 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
@@ -25,15 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Reflection;
 using Nini.Config;
 using log4net;
-using OpenSim.Server.Base;
-using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 
@@ -44,70 +39,39 @@ namespace OpenSim.Server.Handlers.Hypergrid
         public HeloServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
                 base(config, server, configName)
         {
-#pragma warning disable 0612
-            server.AddStreamHandler(new HeloServerGetHandler("opensim-robust"));
-#pragma warning restore 0612
-            server.AddStreamHandler(new HeloServerHeadHandler("opensim-robust"));
+            server.AddSimpleStreamHandler(new HeloServerGetAndHeadHandler("opensim-robust"));
         }
     }
 
-    [Obsolete]
-    public class HeloServerGetHandler : BaseStreamHandler
+    public class HeloServerGetAndHeadHandler : SimpleStreamHandler
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_HandlersType;
 
-        public HeloServerGetHandler(string handlersType) :
-            base("GET", "/helo")
+        public HeloServerGetAndHeadHandler(string handlersType) : base("/helo")
         {
             m_HandlersType = handlersType;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
-                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override void ProcessRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            return OKResponse(httpResponse);
-        }
-
-        private byte[] OKResponse(IOSHttpResponse httpResponse)
-        {
-            m_log.Debug("[HELO]: hi, GET was called");
+            if (httpRequest.HttpMethod == "GET")
+            {
+                //Obsolete
+                m_log.Debug("[HELO]: hi, GET was called");
+            }
+            else if (httpRequest.HttpMethod == "HEAD")
+            {
+                m_log.Debug("[HELO]: hi, HEAD was called");
+            }
+            else
+            {
+                httpResponse.StatusCode = (int)HttpStatusCode.MethodNotAllowed;
+                return;
+            }
             httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType);
             httpResponse.StatusCode = (int)HttpStatusCode.OK;
-            httpResponse.StatusDescription = "OK";
-            return new byte[0];
         }
-
     }
-
-    public class HeloServerHeadHandler : BaseStreamHandler
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private string m_HandlersType;
-
-        public HeloServerHeadHandler(string handlersType) :
-            base("HEAD", "/helo")
-        {
-            m_HandlersType = handlersType;
-        }
-
-        protected override byte[] ProcessRequest(string path, Stream requestData,
-                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-        {
-            return OKResponse(httpResponse);
-        }
-
-        private byte[] OKResponse(IOSHttpResponse httpResponse)
-        {
-            m_log.Debug("[HELO]: hi, HEAD was called");
-            httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType);
-            httpResponse.StatusCode = (int)HttpStatusCode.OK;
-            httpResponse.StatusDescription = "OK";
-            return new byte[0];
-        }
-
-    }
-
 }