diff --git a/http/http_connection.h b/http/http_connection.h
index 1a8f6cd..5f4681f 100644
--- a/http/http_connection.h
+++ b/http/http_connection.h
@@ -1,6 +1,12 @@
 #pragma once
 #include "config.h"
 
+#include "http_response.h"
+#include "logging.h"
+#include "middleware_context.h"
+#include "timer_queue.h"
+#include "utility.h"
+
 #include "http_utility.hpp"
 
 #include <boost/algorithm/string.hpp>
@@ -9,23 +15,12 @@
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
-
-#include <atomic>
-#if BOOST_VERSION >= 107000
-#include <boost/beast/ssl/ssl_stream.hpp>
-#else
-#include <boost/beast/experimental/core/ssl_stream.hpp>
-#endif
-#include "http_response.h"
-#include "logging.h"
-#include "middleware_context.h"
-#include "timer_queue.h"
-#include "utility.h"
-
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/beast/websocket.hpp>
 #include <ssl_key_handler.hpp>
 
+#include <atomic>
 #include <chrono>
 #include <vector>
 
diff --git a/http/http_request.h b/http/http_request.h
index 67cc944..0691465 100644
--- a/http/http_request.h
+++ b/http/http_request.h
@@ -7,13 +7,8 @@
 
 #include <boost/asio/io_context.hpp>
 #include <boost/beast/http.hpp>
-#include <boost/beast/websocket.hpp>
-
-#if BOOST_VERSION >= 107000
 #include <boost/beast/ssl/ssl_stream.hpp>
-#else
-#include <boost/beast/experimental/core/ssl_stream.hpp>
-#endif
+#include <boost/beast/websocket.hpp>
 
 namespace crow
 {
diff --git a/http/http_server.h b/http/http_server.h
index 50e96c2..3287ed9 100644
--- a/http/http_server.h
+++ b/http/http_server.h
@@ -1,25 +1,19 @@
 #pragma once
 
+#include "http_connection.h"
+#include "logging.h"
+#include "timer_queue.h"
+
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/signal_set.hpp>
 #include <boost/asio/ssl/context.hpp>
 #include <boost/asio/steady_timer.hpp>
-
-#include <atomic>
-#if BOOST_VERSION >= 107000
 #include <boost/beast/ssl/ssl_stream.hpp>
-#else
-#include <boost/beast/experimental/core/ssl_stream.hpp>
-#endif
-
-#include "http_connection.h"
-#include "logging.h"
-#include "timer_queue.h"
-
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <ssl_key_handler.hpp>
 
+#include <atomic>
 #include <chrono>
 #include <cstdint>
 #include <filesystem>
diff --git a/include/dump_offload.hpp b/include/dump_offload.hpp
index 1b956e7..1777dfe 100644
--- a/include/dump_offload.hpp
+++ b/include/dump_offload.hpp
@@ -247,13 +247,8 @@
      */
     void resetBuffers()
     {
-#if BOOST_VERSION >= 107000
         this->inputBuffer->clear();
         this->outputBuffer->clear();
-#else
-        this->inputBuffer->reset();
-        this->outputBuffer->reset();
-#endif
     }
 
     boost::process::async_pipe pipeOut;
diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp
index 07f72c6..dc352e2 100644
--- a/include/vm_websocket.hpp
+++ b/include/vm_websocket.hpp
@@ -189,13 +189,8 @@
             [](crow::websocket::Connection& conn, const std::string& reason) {
                 session = nullptr;
                 handler->doClose();
-#if BOOST_VERSION >= 107000
                 handler->inputBuffer->clear();
                 handler->outputBuffer->clear();
-#else
-                handler->inputBuffer->reset();
-                handler->outputBuffer->reset();
-#endif
                 handler.reset();
             })
         .onmessage([](crow::websocket::Connection& conn,