diff --git a/moveit_setup_assistant/README.md b/moveit_setup_assistant/README.md
index 66e8ab05ca..615cf0f5f8 100644
--- a/moveit_setup_assistant/README.md
+++ b/moveit_setup_assistant/README.md
@@ -106,4 +106,4 @@ The format for the templates is custom to MSA. Let's assume you have a `Template
 
 becomes
 
-   <name>r2d2_moveit_config</name>
+    <name>r2d2_moveit_config</name>
diff --git a/moveit_setup_assistant/moveit_setup_assistant/src/main.cpp b/moveit_setup_assistant/moveit_setup_assistant/src/main.cpp
index 421f9ca5d4..27c9e6c07a 100644
--- a/moveit_setup_assistant/moveit_setup_assistant/src/main.cpp
+++ b/moveit_setup_assistant/moveit_setup_assistant/src/main.cpp
@@ -93,12 +93,6 @@ int main(int argc, char** argv)
   auto client = std::make_unique<rviz_common::ros_integration::RosClientAbstraction>();
   auto node = client->init(argc, argv, "moveit_setup_assistant", false);
 
-  /* TODO:
-   * Migration Notes:
-   *   ROS 1 MSA had an explicit SIGINT handler (ros::init_options::NoSigintHandler) not replicated here
-   *   ROS 1 MSA also started an ASyncSpinner
-   */
-
   // Create Qt Application
   QApplication qt_app(argc, argv);
   // numeric values should always be POSIX
diff --git a/moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files_widget.hpp b/moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files_widget.hpp
index 52bff0937d..28ce9be764 100644
--- a/moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files_widget.hpp
+++ b/moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files_widget.hpp
@@ -43,7 +43,6 @@
 #include <QList>
 #include <QLabel>
 #include <QListWidget>
-#include <QListWidget>
 #include <QListWidgetItem>
 #include <QProgressBar>
 #include <QPushButton>