diff --git a/include/boost/beast/_experimental/core/detail/service_base.hpp b/include/boost/beast/_experimental/core/detail/service_base.hpp
deleted file mode 100644
index b936a0bc..00000000
--- a/include/boost/beast/_experimental/core/detail/service_base.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (c) 2018 Vinnie Falco (vinnie dot falco at gmail dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// Official repository: https://github.com/boostorg/beast
-//
-
-#ifndef BOOST_BEAST_CORE_DETAIL_SERVICE_BASE_HPP
-#define BOOST_BEAST_CORE_DETAIL_SERVICE_BASE_HPP
-
-#include <boost/asio/execution_context.hpp>
-
-namespace boost {
-namespace beast {
-namespace detail {
-
-template<class T>
-class service_id : public net::execution_context::id
-{
-};
-
-template<class T>
-class service_base
-    : public net::execution_context::service
-{
-protected:
-    net::execution_context& ctx_;
-
-public:
-    static service_id<T> id;
-
-    explicit
-    service_base(net::execution_context& ctx)
-        : net::execution_context::service(ctx)
-        , ctx_(ctx)
-    {
-    }
-};
-
-template<class T>
-service_id<T>
-service_base<T>::id;
-
-} // detail
-} // beast
-} // boost
-
-#endif
diff --git a/include/boost/beast/websocket/impl/handshake.hpp b/include/boost/beast/websocket/impl/handshake.hpp
index cc6ff898..33f8e4f2 100644
--- a/include/boost/beast/websocket/impl/handshake.hpp
+++ b/include/boost/beast/websocket/impl/handshake.hpp
@@ -97,9 +97,7 @@ public:
 
             // VFALCO We could pre-serialize the request to
             //        a single buffer, send that instead,
-            //        and delete the buffer here. The buffer
-            //        could be a variable block at the end
-            //        of handler_ptr's allocation.
+            //        and delete the buffer here.
 
             // Read HTTP response
             BOOST_ASIO_CORO_YIELD