diff --git a/qt_gui_cpp/include/qt_gui_cpp/ros_pluginlib_plugin_provider.hpp b/qt_gui_cpp/include/qt_gui_cpp/ros_pluginlib_plugin_provider.hpp
index cd89e5d8..b419dba1 100644
--- a/qt_gui_cpp/include/qt_gui_cpp/ros_pluginlib_plugin_provider.hpp
+++ b/qt_gui_cpp/include/qt_gui_cpp/ros_pluginlib_plugin_provider.hpp
@@ -145,13 +145,6 @@ class RosPluginlibPluginProvider
       attributes["class_base_class_type"] = class_loader_->getBaseClassType().c_str();
       attributes["package_name"] = class_loader_->getClassPackage(lookup_name).c_str();
       attributes["plugin_path"] = plugin_path.c_str();
-
-      // check if plugin is available
-      // std::string library_path = class_loader_->getClassLibraryPath(lookup_name);
-      // attributes["not_available"] =
-      //   !std::ifstream(library_path.c_str()) ?
-      //      QString("library ").append(lookup_name.c_str()).append(
-      //        " not found (may be it must be built?)") : "";
       attributes["not_available"] = "";
 
       PluginDescriptor * plugin_descriptor = new PluginDescriptor(lookup_name.c_str(), attributes);
@@ -230,8 +223,6 @@ class RosPluginlibPluginProvider
         return 0;
       }
     }
-
-    // qDebug("RosPluginlibPluginProvider::load_explicit_type(%s) succeeded", lookup_name.c_str());
     instances_[&*instance] = instance;
 
     return &*instance;
@@ -314,11 +305,7 @@ class RosPluginlibPluginProvider
     QString & label, QString & statustip, QString & icon, QString & icontype,
     PluginDescriptor * plugin_descriptor)
   {
-    // qDebug("RosPluginlibPluginProvider::parseManifest()");
-
     std::string manifest_path = class_loader_->getPluginManifestPath(lookup_name);
-    // qDebug("RosPluginlibPluginProvider::parseManifest() manifest_path \"%s\"",
-    //    manifest_path.c_str());
     tinyxml2::XMLDocument doc;
     tinyxml2::XMLError result = doc.LoadFile(manifest_path.c_str());
     if (result != tinyxml2::XML_SUCCESS) {
diff --git a/qt_gui_cpp/include/qt_gui_cpp/settings.hpp b/qt_gui_cpp/include/qt_gui_cpp/settings.hpp
index 5dee140a..0b64abf2 100644
--- a/qt_gui_cpp/include/qt_gui_cpp/settings.hpp
+++ b/qt_gui_cpp/include/qt_gui_cpp/settings.hpp
@@ -58,22 +58,14 @@ class Settings
 
   QStringList allKeys() const;
 
-//  int beginReadArray(const QString& prefix);
-
-//  void beginWriteArray(const QString& prefix, int size = -1);
-
   QStringList childGroups() const;
 
   QStringList childKeys() const;
 
   bool contains(const QString & key) const;
 
-//  void endArray();
-
   void remove(const QString & key);
 
-//  void setArrayIndex(int i);
-
   void setValue(const QString & key, const QVariant & value);
 
   QVariant value(const QString & key, const QVariant & defaultValue = QVariant()) const;
diff --git a/qt_gui_cpp/src/qt_gui_cpp/generic_proxy.cpp b/qt_gui_cpp/src/qt_gui_cpp/generic_proxy.cpp
index 336c7f0f..75958e86 100644
--- a/qt_gui_cpp/src/qt_gui_cpp/generic_proxy.cpp
+++ b/qt_gui_cpp/src/qt_gui_cpp/generic_proxy.cpp
@@ -57,8 +57,7 @@ bool GenericProxy::invokeMethod(
   QGenericArgument val6, QGenericArgument val7, QGenericArgument val8, QGenericArgument val9)
 {
   if (!object_) {return false;}
-  // qDebug("GenericProxy::invokeMethod(%s, %s)",
-  //   object_->objectName().toStdString().c_str(), member);
+
   return QMetaObject::invokeMethod(object_, member, Qt::DirectConnection, val0, val1, val2, val3,
       val4, val5, val6, val7, val8, val9);
 }
@@ -70,8 +69,7 @@ bool GenericProxy::invokeMethodWithReturn(
   QGenericArgument val8, QGenericArgument val9)
 {
   if (!object_) {return false;}
-  // qDebug("GenericProxy::invokeMethodWithReturn(%s, %s)",
-  //    object_->objectName().toStdString().c_str(), member);
+
   return QMetaObject::invokeMethod(object_, member, Qt::DirectConnection, ret, val0, val1, val2,
       val3, val4, val5, val6, val7, val8, val9);
 }
diff --git a/qt_gui_py_common/CMakeLists.txt b/qt_gui_py_common/CMakeLists.txt
index 282cf22f..b53f07ca 100644
--- a/qt_gui_py_common/CMakeLists.txt
+++ b/qt_gui_py_common/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.20)
 project(qt_gui_py_common)
 
 find_package(ament_cmake REQUIRED)