diff --git a/BeastConfig.h b/BeastConfig.h
index dd2abedbf..e3e9d2173 100644
--- a/BeastConfig.h
+++ b/BeastConfig.h
@@ -150,13 +150,6 @@
 
 //------------------------------------------------------------------------------
 
-// This is only here temporarily. Use it to turn off MultiSocket
-// in Peer code if you suspect you're having problems because of it.
-//
-#ifndef RIPPLE_PEER_USES_BEAST_MULTISOCKET
-#define RIPPLE_PEER_USES_BEAST_MULTISOCKET 1
-#endif
-
 // Here temporarily to turn off new Validations code while it
 // is being written.
 //
diff --git a/modules/ripple_app/main/ripple_Application.cpp b/modules/ripple_app/main/ripple_Application.cpp
index 6b42c2dbe..84ed7bea5 100644
--- a/modules/ripple_app/main/ripple_Application.cpp
+++ b/modules/ripple_app/main/ripple_Application.cpp
@@ -193,12 +193,27 @@ public:
 
     ~ApplicationImp ()
     {
+        stop ();
         m_networkOPs = nullptr;
 
         // VFALCO TODO Wrap these in ScopedPointer
-        delete mTxnDB;
-        delete mLedgerDB;
-        delete mWalletDB;
+        if (mTxnDB != nullptr)
+        {
+            delete mTxnDB;
+            mTxnDB = nullptr;
+        }
+
+        if (mLedgerDB != nullptr)
+        {
+            delete mLedgerDB;
+            mLedgerDB = nullptr;
+        }
+
+        if (mWalletDB != nullptr)
+        {
+            delete mWalletDB;
+            mWalletDB = nullptr;
+        }
     }
 
     //--------------------------------------------------------------------------
@@ -563,7 +578,6 @@ public:
 
             if (getConfig ().peerPROXYListeningPort != 0)
             {
-#if RIPPLE_PEER_USES_BEAST_MULTISOCKET
                 // Also listen on a PROXY-only port.
                 m_peerProxyDoor = PeerDoor::New (
                     PeerDoor::sslAndPROXYRequired,
@@ -571,10 +585,6 @@ public:
                     getConfig ().peerPROXYListeningPort,
                     m_mainService,
                     m_peerSSLContext->get ());
-#else
-                WriteLog (lsWARNING, Application) <<
-                    "Peer PROXY interface: configured but disabled by build configuration.";
-#endif
             }
         }
         else
diff --git a/modules/ripple_app/peers/ripple_Peer.cpp b/modules/ripple_app/peers/ripple_Peer.cpp
index f4cef8144..46697f854 100644
--- a/modules/ripple_app/peers/ripple_Peer.cpp
+++ b/modules/ripple_app/peers/ripple_Peer.cpp
@@ -32,9 +32,7 @@ public:
     //
     //
 
-#if RIPPLE_PEER_USES_BEAST_MULTISOCKET
     ScopedPointer <MultiSocket> m_socket;
-    //boost::asio::io_service& m_strand;
     boost::asio::io_service::strand m_strand;
 
     NativeSocketType& getNativeSocket ()
@@ -52,30 +50,6 @@ public:
         return *m_socket;
     }
 
-    //---------------------------------------------------------------------------
-#else
-    typedef boost::asio::ssl::stream <NativeSocketType&> SslStreamType;
-    NativeSocketType m_socket;
-    SslStreamType m_ssl_stream;
-    boost::asio::io_service::strand m_strand;
-
-    NativeSocketType& getNativeSocket ()
-    {
-        return m_socket;
-    }
-
-    SslStreamType& getHandshakeStream ()
-    {
-        return m_ssl_stream;
-    }
-
-    SslStreamType& getStream ()
-    {
-        return m_ssl_stream;
-    }
-
-#endif
-
     //
     //
     //
@@ -88,15 +62,9 @@ public:
                       bool inbound,
                       MultiSocket::Flag flags)
         : m_isInbound (inbound)
-#if RIPPLE_PEER_USES_BEAST_MULTISOCKET
         , m_socket (MultiSocket::New (
             io_service, ssl_context, flags.asBits ()))
         , m_strand (io_service)
-#else
-        , m_socket (io_service)
-        , m_ssl_stream (m_socket, ssl_context)
-        , m_strand (io_service)
-#endif
         , mHelloed (false)
         , mDetaching (false)
         , mActive (2)
@@ -317,7 +285,6 @@ private:
         }
         else
         {
-        #if RIPPLE_PEER_USES_BEAST_MULTISOCKET
             if (m_socket->getFlags ().set (MultiSocket::Flag::proxy) && m_isInbound)
             {
                 MultiSocket::ProxyInfo const proxyInfo (m_socket->getProxyInfo ());
@@ -350,7 +317,6 @@ private:
                 }
             }
             else
-        #endif
             {
                 // Must compute mCookieHash before receiving a hello.
                 sendHello ();
@@ -2604,12 +2570,7 @@ Peer::pointer Peer::New (boost::asio::io_service& io_service,
 
         if (requirePROXYHandshake)
         {
-#if RIPPLE_PEER_USES_BEAST_MULTISOCKET
             flags = flags.with (MultiSocket::Flag::proxy);
-#else
-            FatalError ("PROXY Handshake support disabled in this build",
-                __FILE__, __LINE__);
-#endif
         }
     }
     else