diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3170ee6..4aec8f03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.0.0-b26
+
+* Tidy up warnings and tests
+
+--------------------------------------------------------------------------------
+
 1.0.0-b25
 
 * Fixes for WebSocket echo server
diff --git a/include/beast/websocket/detail/stream_base.hpp b/include/beast/websocket/detail/stream_base.hpp
index 1a4f13e6..b183fc46 100644
--- a/include/beast/websocket/detail/stream_base.hpp
+++ b/include/beast/websocket/detail/stream_base.hpp
@@ -435,17 +435,7 @@ read_fh2(detail::frame_header& fh,
                 code = close_code::too_big;
                 return;
             }
-            //rd_.size += fh.len;
         }
-    #if 0
-        if(rd_msg_max_ && rd_.size > rd_msg_max_)
-        {
-            code = close_code::too_big;
-            return;
-        }
-    #else
-        #pragma message("Disabled close_code::too_big for permessage-deflate!")
-    #endif
         rd_.cont = ! fh.fin;
     }
     code = close_code::none;
diff --git a/include/beast/websocket/impl/stream.ipp b/include/beast/websocket/impl/stream.ipp
index 91093dd7..a8c2ff61 100644
--- a/include/beast/websocket/impl/stream.ipp
+++ b/include/beast/websocket/impl/stream.ipp
@@ -220,7 +220,6 @@ do_response(http::response<Body, Fields> const& res,
     pmd_read(offer, res.fields);
     // VFALCO see if offer satisfies pmd_config_,
     //        return an error if not.
-    #pragma message("Check offer in do_response")
     pmd_config_ = offer; // overwrite for now
     open(detail::role_type::client);
 }
diff --git a/test/websocket/frame.cpp b/test/websocket/frame.cpp
index 135d5abe..eb690f65 100644
--- a/test/websocket/frame.cpp
+++ b/test/websocket/frame.cpp
@@ -229,12 +229,8 @@ public:
     void run() override
     {
         testCloseCodes();
-    #if 0
         testFrameHeader();
         testBadFrameHeaders();
-    #else
-        #pragma message("Disabled testFrameHeader, testBadFrameHeaders for permessage-deflate!")
-    #endif
     }
 };