diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
index 08e4566656..b834234cc5 100644
--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -198,7 +198,6 @@ public:
     std::unique_ptr <RPCDoor>  m_rpcDoor;
     std::unique_ptr <WSDoor> m_wsPublicDoor;
     std::unique_ptr <WSDoor> m_wsPrivateDoor;
-    std::unique_ptr <WSDoor> m_wsProxyDoor;
 
     beast::WaitableEvent m_stop;
 
@@ -777,19 +776,6 @@ public:
         {
             m_journal.info << "WebSocket public interface: disabled";
         }
-        if (!getConfig ().WEBSOCKET_PROXY_IP.empty () && getConfig ().WEBSOCKET_PROXY_PORT)
-        {
-            m_wsProxyDoor.reset (WSDoor::New (*m_resourceManager,
-                getOPs(), getConfig ().WEBSOCKET_PROXY_IP,
-                    getConfig ().WEBSOCKET_PROXY_PORT, true, true,
-                        m_wsSSLContext->get ()));
-
-            if (m_wsProxyDoor == nullptr)
-            {
-                beast::FatalError ("Could not open the WebSocket public interface.",
-                    __FILE__, __LINE__);
-            }
-        }
 
         //----------------------------------------------------------------------
 
diff --git a/src/ripple/core/Config.h b/src/ripple/core/Config.h
index 142386846a..ad03fa1543 100644
--- a/src/ripple/core/Config.h
+++ b/src/ripple/core/Config.h
@@ -327,10 +327,6 @@ public:
     int                         WEBSOCKET_PUBLIC_PORT;
     int                         WEBSOCKET_PUBLIC_SECURE;
 
-    std::string                 WEBSOCKET_PROXY_IP;        // XXX Going away. Merge with the inbound peer connction.
-    int                         WEBSOCKET_PROXY_PORT;
-    int                         WEBSOCKET_PROXY_SECURE;
-
     std::string                 WEBSOCKET_IP;
     int                         WEBSOCKET_PORT;
     int                         WEBSOCKET_SECURE;
diff --git a/src/ripple/core/ConfigSections.h b/src/ripple/core/ConfigSections.h
index f0d482124a..c6bf45ae6c 100644
--- a/src/ripple/core/ConfigSections.h
+++ b/src/ripple/core/ConfigSections.h
@@ -90,9 +90,6 @@ struct ConfigSection
 #define SECTION_WEBSOCKET_PUBLIC_IP     "websocket_public_ip"
 #define SECTION_WEBSOCKET_PUBLIC_PORT   "websocket_public_port"
 #define SECTION_WEBSOCKET_PUBLIC_SECURE "websocket_public_secure"
-#define SECTION_WEBSOCKET_PROXY_IP      "websocket_proxy_ip"
-#define SECTION_WEBSOCKET_PROXY_PORT    "websocket_proxy_port"
-#define SECTION_WEBSOCKET_PROXY_SECURE  "websocket_proxy_secure"
 #define SECTION_WEBSOCKET_PING_FREQ     "websocket_ping_frequency"
 #define SECTION_WEBSOCKET_IP            "websocket_ip"
 #define SECTION_WEBSOCKET_PORT          "websocket_port"
diff --git a/src/ripple/core/impl/Config.cpp b/src/ripple/core/impl/Config.cpp
index 9f2c736426..5c69c05ed8 100644
--- a/src/ripple/core/impl/Config.cpp
+++ b/src/ripple/core/impl/Config.cpp
@@ -245,8 +245,6 @@ Config::Config ()
     WEBSOCKET_PORT          = 6562;
     WEBSOCKET_PUBLIC_PORT   = 6563;
     WEBSOCKET_PUBLIC_SECURE = 1;
-    WEBSOCKET_PROXY_PORT    = 0;
-    WEBSOCKET_PROXY_SECURE  = 1;
     WEBSOCKET_SECURE        = 0;
     WEBSOCKET_PING_FREQ     = (5 * 60);
 
@@ -577,20 +575,12 @@ void Config::load ()
             if (getSingleSection (secConfig, SECTION_WEBSOCKET_PUBLIC_PORT, strTemp))
                 WEBSOCKET_PUBLIC_PORT   = beast::lexicalCastThrow <int> (strTemp);
 
-            (void) getSingleSection (secConfig, SECTION_WEBSOCKET_PROXY_IP, WEBSOCKET_PROXY_IP);
-
-            if (getSingleSection (secConfig, SECTION_WEBSOCKET_PROXY_PORT, strTemp))
-                WEBSOCKET_PROXY_PORT   = beast::lexicalCastThrow <int> (strTemp);
-
             if (getSingleSection (secConfig, SECTION_WEBSOCKET_SECURE, strTemp))
                 WEBSOCKET_SECURE    = beast::lexicalCastThrow <int> (strTemp);
 
             if (getSingleSection (secConfig, SECTION_WEBSOCKET_PUBLIC_SECURE, strTemp))
                 WEBSOCKET_PUBLIC_SECURE = beast::lexicalCastThrow <int> (strTemp);
 
-            if (getSingleSection (secConfig, SECTION_WEBSOCKET_PROXY_SECURE, strTemp))
-                WEBSOCKET_PROXY_SECURE = beast::lexicalCastThrow <int> (strTemp);
-
             if (getSingleSection (secConfig, SECTION_WEBSOCKET_PING_FREQ, strTemp))
                 WEBSOCKET_PING_FREQ = beast::lexicalCastThrow <int> (strTemp);
 
diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/ripple/overlay/impl/PeerImp.h
index 23526bd5cb..63864faeaa 100644
--- a/src/ripple/overlay/impl/PeerImp.h
+++ b/src/ripple/overlay/impl/PeerImp.h
@@ -116,8 +116,7 @@ private:
     ShortId shortId_ = 0;
 
     // Updated at each stage of the connection process to reflect
-    // the current conditions as closely as possible. This includes
-    // the case where we learn the true IP via a PROXY handshake.
+    // the current conditions as closely as possible.
     beast::IP::Endpoint remote_address_;
 
     // These is up here to prevent warnings about order of initializations