diff --git a/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h b/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h
--- a/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h
+++ b/services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h
@@ -5,7 +5,6 @@
 
 #include <folly/concurrency/ConcurrentHashMap.h>
 
-#include <iostream>
 #include <string>
 
 namespace comm {
diff --git a/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h b/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h
--- a/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h
+++ b/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h
@@ -5,7 +5,6 @@
 
 #include <grpcpp/grpcpp.h>
 
-#include <iostream>
 #include <string>
 
 namespace comm {
diff --git a/services/tunnelbroker/src/Tools/ConfigManager.h b/services/tunnelbroker/src/Tools/ConfigManager.h
--- a/services/tunnelbroker/src/Tools/ConfigManager.h
+++ b/services/tunnelbroker/src/Tools/ConfigManager.h
@@ -2,7 +2,6 @@
 
 #include <boost/program_options.hpp>
 
-#include <iostream>
 #include <string>
 
 namespace comm {
diff --git a/services/tunnelbroker/src/Tools/CryptoTools.cpp b/services/tunnelbroker/src/Tools/CryptoTools.cpp
--- a/services/tunnelbroker/src/Tools/CryptoTools.cpp
+++ b/services/tunnelbroker/src/Tools/CryptoTools.cpp
@@ -8,8 +8,6 @@
 #include <cryptopp/rsa.h>
 #include <glog/logging.h>
 
-#include <iostream>
-
 namespace comm {
 namespace network {
 namespace crypto {
diff --git a/services/tunnelbroker/src/Tools/Tools.cpp b/services/tunnelbroker/src/Tools/Tools.cpp
--- a/services/tunnelbroker/src/Tools/Tools.cpp
+++ b/services/tunnelbroker/src/Tools/Tools.cpp
@@ -6,7 +6,6 @@
 #include <boost/lexical_cast.hpp>
 
 #include <chrono>
-#include <iostream>
 #include <random>
 #include <regex>
 
diff --git a/services/tunnelbroker/src/server.cpp b/services/tunnelbroker/src/server.cpp
--- a/services/tunnelbroker/src/server.cpp
+++ b/services/tunnelbroker/src/server.cpp
@@ -7,7 +7,6 @@
 #include <glog/logging.h>
 #include <grpcpp/grpcpp.h>
 
-#include <iostream>
 #include <string>
 #include <thread>