diff --git a/examples/pub/main.cpp b/examples/pub/main.cpp
index edb970f..ab06dfc 100644
--- a/examples/pub/main.cpp
+++ b/examples/pub/main.cpp
@@ -78,7 +78,7 @@ int main( int argc, char* argv[] )
     {
         std::cout << "{OK}" << std::endl;
         std::cout << "Connecting to the broker : ";
-        pPublisher->connect( "office.osdev.nl", 1883, "", "" );
+        pPublisher->connect( "localhost", 1883, "", "" );
 
         // Assume we are connected now, start publishing.
         while( 1 )
diff --git a/examples/pub/publisher.cpp b/examples/pub/publisher.cpp
index 07c0ee0..efd9dfe 100644
--- a/examples/pub/publisher.cpp
+++ b/examples/pub/publisher.cpp
@@ -20,9 +20,6 @@
  * DEALINGS IN THE SOFTWARE.                                                  *
  * ***************************************************************************/
 
-// osdev::components::mqtt
-// #include "token.h"
-
 // mqtt_tests
 #include "publisher.h"
 
diff --git a/examples/sub/main.cpp b/examples/sub/main.cpp
index 0699e74..a9c18fb 100644
--- a/examples/sub/main.cpp
+++ b/examples/sub/main.cpp
@@ -76,7 +76,7 @@ int main( int argc, char* argv[] )
     {
         std::cout << "[OK]" << std::endl;
         std::cout << "Connecting to the test-broker : " << std::endl;
-        pSubscriber->connect( "office.osdev.nl", 1883, "", "" );
+        pSubscriber->connect( "localhost", 1883, "", "" );
         std::cout << "Subscribing to the test-topic....." << std::endl;
         pSubscriber->subscribe( "test/publisher/#" );
 
diff --git a/include/mqttsubscriberbase.h b/include/mqttsubscriberbase.h
index 956a8f5..942d807 100644
--- a/include/mqttsubscriberbase.h
+++ b/include/mqttsubscriberbase.h
@@ -25,6 +25,7 @@
 #include <memory>
 #include <string>
 
+// osdev::components::mqtt
 #include "mqttclient.h"
 
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e4f8c37..6820971 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,24 +59,6 @@ set(SRC_LIST
     ${CMAKE_CURRENT_SOURCE_DIR}/sharedreaderlock.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/stringutils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/uriparser.cpp
-    # Helper files ( Utillities )
-    # ${CMAKE_CURRENT_SOURCE_DIR}/bimap.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/compat-c++14.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/compat-chrono.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/histogram.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/histogramprovider.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/imqttclient.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/imqttclientimpl.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/lockguard.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/macrodefs.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/measure.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/metaprogrammingdefs.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/mqttstream.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/stringify.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/stringutils.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/synchronizedqueue.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/utils.h
-    # ${CMAKE_CURRENT_SOURCE_DIR}/uriutils.h
 )
 
 include(library)
diff --git a/src/mqttsubscriberbase.cpp b/src/mqttsubscriberbase.cpp
index 48afb64..d32bd0f 100644
--- a/src/mqttsubscriberbase.cpp
+++ b/src/mqttsubscriberbase.cpp
@@ -19,6 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        *
  * DEALINGS IN THE SOFTWARE.                                                  *
  * ***************************************************************************/
+
+// osdev::components::mqtt
 #include "mqttclient.h"
 #include "mqttsubscriberbase.h"
 #include "mqttmessage.h"