diff --git a/samples/ros2_cpp_all_pkg/src/ros2_cpp_node.cpp b/samples/ros2_cpp_all_pkg/src/ros2_cpp_node.cpp
index 7a45362..c6fb53d 100644
--- a/samples/ros2_cpp_all_pkg/src/ros2_cpp_node.cpp
+++ b/samples/ros2_cpp_all_pkg/src/ros2_cpp_node.cpp
@@ -108,7 +108,6 @@ void Ros2CppNode::declareAndLoadParameter(const std::string& name,
   }
 
   if (add_to_auto_reconfigurable_params) {
-    // TODO: why so complicated, storing lambda functions? / why vector, not map?
     std::function<void(const rclcpp::Parameter&)> setter = [&param](const rclcpp::Parameter& p) {
       param = p.get_value<T>();
     };
diff --git a/samples/ros2_cpp_component_pkg/src/ros2_cpp_node.cpp b/samples/ros2_cpp_component_pkg/src/ros2_cpp_node.cpp
index 11867d8..9a59593 100644
--- a/samples/ros2_cpp_component_pkg/src/ros2_cpp_node.cpp
+++ b/samples/ros2_cpp_component_pkg/src/ros2_cpp_node.cpp
@@ -101,7 +101,6 @@ void Ros2CppNode::declareAndLoadParameter(const std::string& name,
   }
 
   if (add_to_auto_reconfigurable_params) {
-    // TODO: why so complicated, storing lambda functions? / why vector, not map?
     std::function<void(const rclcpp::Parameter&)> setter = [&param](const rclcpp::Parameter& p) {
       param = p.get_value<T>();
     };
diff --git a/samples/ros2_cpp_lifecycle_pkg/src/ros2_cpp_node.cpp b/samples/ros2_cpp_lifecycle_pkg/src/ros2_cpp_node.cpp
index 94d7da6..f0bdd4e 100644
--- a/samples/ros2_cpp_lifecycle_pkg/src/ros2_cpp_node.cpp
+++ b/samples/ros2_cpp_lifecycle_pkg/src/ros2_cpp_node.cpp
@@ -103,7 +103,6 @@ void Ros2CppNode::declareAndLoadParameter(const std::string& name,
   }
 
   if (add_to_auto_reconfigurable_params) {
-    // TODO: why so complicated, storing lambda functions? / why vector, not map?
     std::function<void(const rclcpp::Parameter&)> setter = [&param](const rclcpp::Parameter& p) {
       param = p.get_value<T>();
     };
diff --git a/samples/ros2_cpp_pkg/src/ros2_cpp_node.cpp b/samples/ros2_cpp_pkg/src/ros2_cpp_node.cpp
index 712e97a..15ae866 100644
--- a/samples/ros2_cpp_pkg/src/ros2_cpp_node.cpp
+++ b/samples/ros2_cpp_pkg/src/ros2_cpp_node.cpp
@@ -98,7 +98,6 @@ void Ros2CppNode::declareAndLoadParameter(const std::string& name,
   }
 
   if (add_to_auto_reconfigurable_params) {
-    // TODO: why so complicated, storing lambda functions? / why vector, not map?
     std::function<void(const rclcpp::Parameter&)> setter = [&param](const rclcpp::Parameter& p) {
       param = p.get_value<T>();
     };
diff --git a/templates/ros2_cpp_pkg/{{ package_name }}/src/{{ node_name }}.cpp.jinja b/templates/ros2_cpp_pkg/{{ package_name }}/src/{{ node_name }}.cpp.jinja
index cb791c7..02ee49d 100644
--- a/templates/ros2_cpp_pkg/{{ package_name }}/src/{{ node_name }}.cpp.jinja	
+++ b/templates/ros2_cpp_pkg/{{ package_name }}/src/{{ node_name }}.cpp.jinja	
@@ -132,7 +132,6 @@ void {{ node_class_name }}::declareAndLoadParameter(const std::string& name,
   }
 
   if (add_to_auto_reconfigurable_params) {
-    // TODO: why so complicated, storing lambda functions? / why vector, not map?
     std::function<void(const rclcpp::Parameter&)> setter = [&param](const rclcpp::Parameter& p) {
       param = p.get_value<T>();
     };