diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
index 8b2930908..df1b1ba08 100644
--- a/src/ripple/app/misc/NetworkOPs.cpp
+++ b/src/ripple/app/misc/NetworkOPs.cpp
@@ -68,10 +68,9 @@
 #include <ripple/rpc/CTID.h>
 #include <ripple/rpc/DeliveredAmount.h>
 #include <ripple/rpc/impl/RPCHelpers.h>
+#include <ripple/rpc/impl/UDPInfoSub.h>
 #include <boost/asio/ip/host_name.hpp>
 #include <boost/asio/steady_timer.hpp>
-#include <ripple/rpc/impl/UDPInfoSub.h>
-#include <ripple/app/misc/StateAccounting.h>
 #include <exception>
 #include <mutex>
 #include <set>
@@ -2192,7 +2191,6 @@ NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
             reserveIncXRP && reserveIncXRP->native())
             jvObj[jss::reserve_inc] = reserveIncXRP->xrp().jsonClipped();
 
-        int x = 0;
         for (auto i = mStreamMaps[sValidations].begin();
              i != mStreamMaps[sValidations].end();)
         {
@@ -4119,10 +4117,9 @@ bool
 NetworkOPsImp::subValidations(InfoSub::ref isrListener)
 {
     std::lock_guard sl(mSubLock);
-    bool const outcome = mStreamMaps[sValidations]
-                             .emplace(isrListener->getSeq(), isrListener)
-                             .second;
-    return outcome;
+    return mStreamMaps[sValidations]
+        .emplace(isrListener->getSeq(), isrListener)
+        .second;
 }
 
 void
diff --git a/src/ripple/rpc/handlers/Subscribe.cpp b/src/ripple/rpc/handlers/Subscribe.cpp
index 5cfa365cb..90cf682e1 100644
--- a/src/ripple/rpc/handlers/Subscribe.cpp
+++ b/src/ripple/rpc/handlers/Subscribe.cpp
@@ -37,7 +37,6 @@ namespace ripple {
 Json::Value
 doSubscribe(RPC::JsonContext& context)
 {
-    std::cout << "doSubscribe called\n";
     InfoSub::pointer ispSub;
     Json::Value jvResult(Json::objectValue);
 
@@ -48,7 +47,6 @@ doSubscribe(RPC::JsonContext& context)
         return rpcError(rpcINVALID_PARAMS);
     }
 
-    std::cout << "doSubscribe called 1\n";
     if (context.params.isMember(jss::url))
     {
         if (context.role != Role::ADMIN)
@@ -114,7 +112,6 @@ doSubscribe(RPC::JsonContext& context)
         ispSub = context.infoSub;
     }
 
-    std::cout << "doSubscribe called 2\n";
     if (context.params.isMember(jss::streams))
     {
         if (!context.params[jss::streams].isArray())
@@ -160,7 +157,6 @@ doSubscribe(RPC::JsonContext& context)
             }
             else if (streamName == "validations")
             {
-                std::cout << "doSubscribe called 3\n";
                 context.netOps.subValidations(ispSub);
             }
             else if (streamName == "peer_status")