diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index 9d7fd201..a271340a 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -175,7 +175,7 @@ namespace WebSocketSharp.Net
       if (prefs != null && prefs.Count > 0)
         return;
 
-      EndPointManager.RemoveEndPoint (this);
+      EndPointManager.RemoveEndPoint (_endpoint.Address, _endpoint.Port);
     }
 
     private static RSACryptoServiceProvider createRSAFromFile (string filename)
diff --git a/websocket-sharp/Net/EndPointManager.cs b/websocket-sharp/Net/EndPointManager.cs
index fe6979a5..c61e476f 100644
--- a/websocket-sharp/Net/EndPointManager.cs
+++ b/websocket-sharp/Net/EndPointManager.cs
@@ -186,23 +186,6 @@ namespace WebSocketSharp.Net
 
     #region Internal Methods
 
-    internal static void RemoveEndPoint (EndPointListener listener)
-    {
-      lock (((ICollection) _addressToEndpoints).SyncRoot) {
-        var addr = listener.Address;
-
-        Dictionary<int, EndPointListener> endpoints;
-        if (!_addressToEndpoints.TryGetValue (addr, out endpoints))
-          return;
-
-        endpoints.Remove (listener.Port);
-        if (endpoints.Count == 0)
-          _addressToEndpoints.Remove (addr);
-
-        listener.Close ();
-      }
-    }
-
     internal static bool RemoveEndPoint (IPAddress address, int port)
     {
       lock (((ICollection) _addressToEndpoints).SyncRoot) {