diff --git a/examples/mime_type.hpp b/examples/mime_type.hpp
index babffd5f..07e7c437 100644
--- a/examples/mime_type.hpp
+++ b/examples/mime_type.hpp
@@ -8,15 +8,16 @@
 #ifndef BEAST_EXAMPLE_HTTP_MIME_TYPE_H_INCLUDED
 #define BEAST_EXAMPLE_HTTP_MIME_TYPE_H_INCLUDED
 
-#include <string>
+#include <beast/core/string_view.hpp>
 #include <boost/filesystem/path.hpp>
+#include <string>
 
 namespace beast {
 namespace http {
 
 // Return the Mime-Type for a given file extension
 template<class = void>
-std::string
+string_view
 mime_type(std::string const& path)
 {
     auto const ext =
diff --git a/include/beast/websocket/detail/debug.hpp b/include/beast/websocket/detail/debug.hpp
deleted file mode 100644
index 2437993e..00000000
--- a/include/beast/websocket/detail/debug.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2013-2017 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)
-//
-
-#ifndef BEAST_WEBSOCKET_DETAIL_DEBUG_HPP
-#define BEAST_WEBSOCKET_DETAIL_DEBUG_HPP
-
-#include <boost/asio/buffer.hpp>
-#include <iomanip>
-#include <sstream>
-#include <string>
-
-namespace beast {
-namespace websocket {
-namespace detail {
-
-template<class = void>
-std::string
-to_hex(boost::asio::const_buffer b)
-{
-    using namespace boost::asio;
-    std::stringstream ss;
-    auto p = buffer_cast<std::uint8_t const*>(b);
-    auto n = buffer_size(b);
-    while(n--)
-    {
-        ss <<
-            std::setfill('0') <<
-            std::setw(2) <<
-            std::hex << int(*p++) << " ";
-    }
-    return ss.str();
-}
-
-template<class Buffers>
-std::string
-to_hex(Buffers const& bs)
-{
-    std::string s;
-    for(auto const& b : bs)
-        s.append(to_hex(boost::asio::const_buffer(b)));
-    return s;
-}
-
-template<class Buffers>
-std::string
-buffers_to_string(Buffers const& bs)
-{
-    using namespace boost::asio;
-    std::string s;
-    s.reserve(buffer_size(bs));
-    for(auto const& b : bs)
-        s.append(buffer_cast<char const*>(b),
-            buffer_size(b));
-    return s;
-}
-
-template<class = void>
-std::string
-format(std::string s)
-{
-    auto const w = 84;
-    for(int n = w*(s.size()/w); n>0; n-=w)
-        s.insert(n, 1, '\n');
-    return s;
-}
-
-} // detail
-} // websocket
-} // beast
-
-#endif