diff --git a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
index 5810a51a..9e9abb3c 100644
--- a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
+++ b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
@@ -31,7 +31,7 @@
 #include "rmw/rmw.h"
 
 ///=============================================================================
-class rmw_context_impl_s
+class rmw_context_impl_s final
 {
 public:
   // Constructor that internally initializes the Zenoh session and other artifacts.
diff --git a/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp b/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp
index f4c7f56d..fde2840a 100644
--- a/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp
+++ b/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <mutex>
-#include <string>
 
 #include "liveliness_utils.hpp"
 
@@ -27,7 +26,7 @@ namespace rmw_zenoh_cpp
 {
 ///=============================================================================
 // The NodeData can only be created via rmw_context_impl_s::create_node_data().
-class NodeData
+class NodeData final
 {
 public:
   // Constructor.
diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
index 80d776c9..467f1f1d 100644
--- a/rmw_zenoh_cpp/src/rmw_zenoh.cpp
+++ b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
@@ -238,8 +238,6 @@ rmw_create_node(
     return nullptr;
   }
 
-  printf("Created node %s\n", name);
-
   node->implementation_identifier = rmw_zenoh_cpp::rmw_zenoh_identifier;
   node->context = context;
   // Store type erased rmw_context_impl_s in node->data so that the NodeData