diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 303ee1718bfbaa84898ed5c89df6994712a43aa4..a41bd06d35363dcdcdf556aa299c3eefac888998 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -346,7 +346,6 @@ MainWindow::MainWindow(QSplashScreen* splashScreen, enum MainWindow::CUSTOM_MODE
     ui.actionLocal3DView->setShortcut(QApplication::translate("MainWindow", "Meta+6", 0));
     ui.actionTerminalView->setShortcut(QApplication::translate("MainWindow", "Meta+7", 0));
     ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Meta+8", 0));
-    ui.actionFirmwareUpdateView->setShortcut(QApplication::translate("MainWindow", "Meta+9", 0));
     ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Meta+Return", 0));
 #else
     ui.actionSetup->setShortcut(QApplication::translate("MainWindow", "Ctrl+1", 0));
@@ -357,7 +356,6 @@ MainWindow::MainWindow(QSplashScreen* splashScreen, enum MainWindow::CUSTOM_MODE
     ui.actionLocal3DView->setShortcut(QApplication::translate("MainWindow", "Ctrl+6", 0));
     ui.actionTerminalView->setShortcut(QApplication::translate("MainWindow", "Ctrl+7", 0));
     ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Ctrl+8", 0));
-    ui.actionFirmwareUpdateView->setShortcut(QApplication::translate("MainWindow", "Ctrl+9", 0));
     ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Ctrl+Return", 0));
 #endif
 
@@ -1224,7 +1222,7 @@ void MainWindow::connectCommonActions()
     // Help Actions
     connect(ui.actionOnline_Documentation, SIGNAL(triggered()), this, SLOT(showHelp()));
     connect(ui.actionDeveloper_Credits, SIGNAL(triggered()), this, SLOT(showCredits()));
-    connect(ui.actionProject_Roadmap_2, SIGNAL(triggered()), this, SLOT(showRoadMap()));
+    connect(ui.actionProject_Roadmap, SIGNAL(triggered()), this, SLOT(showRoadMap()));
 
     // Custom widget actions
     connect(ui.actionNewCustomWidget, SIGNAL(triggered()), this, SLOT(createCustomWidget()));
@@ -1235,13 +1233,6 @@ void MainWindow::connectCommonActions()
     connect(GAudioOutput::instance(), SIGNAL(mutedChanged(bool)), ui.actionMuteAudioOutput, SLOT(setChecked(bool)));
     connect(ui.actionMuteAudioOutput, SIGNAL(triggered(bool)), GAudioOutput::instance(), SLOT(mute(bool)));
 
-    // User interaction
-    // NOTE: Joystick thread is not started and
-    // configuration widget is not instantiated
-    // unless it is actually used
-    // so no ressources spend on this.
-    ui.actionJoystickSettings->setVisible(true);
-
     // Application Settings
     connect(ui.actionSettings, SIGNAL(triggered()), this, SLOT(showSettings()));
 
diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui
index ee8df3e73d5ec10b27c5b578187ec42da1005e2d..4be510fc5022d69faed3e882ec17b4f59e6b6d5d 100644
--- a/src/ui/MainWindow.ui
+++ b/src/ui/MainWindow.ui
@@ -58,7 +58,6 @@
     <property name="title">
      <string>File</string>
     </property>
-    <addaction name="actionJoystick_Settings"/>
     <addaction name="actionSimulate"/>
     <addaction name="separator"/>
     <addaction name="actionMuteAudioOutput"/>
@@ -87,7 +86,7 @@
      <string>Help</string>
     </property>
     <addaction name="actionOnline_Documentation"/>
-    <addaction name="actionProject_Roadmap_2"/>
+    <addaction name="actionProject_Roadmap"/>
     <addaction name="actionDeveloper_Credits"/>
    </widget>
    <widget class="QMenu" name="menuPerspectives">
@@ -102,7 +101,6 @@
     <addaction name="actionLocal3DView"/>
     <addaction name="actionTerminalView"/>
     <addaction name="actionSimulationView"/>
-    <addaction name="actionFirmwareUpdateView"/>
     <addaction name="separator"/>
     <addaction name="actionFullscreen"/>
     <addaction name="actionNormal"/>
@@ -181,18 +179,6 @@
     <string>Add Link</string>
    </property>
   </action>
-  <action name="actionJoystickSettings">
-   <property name="icon">
-    <iconset resource="../../qgroundcontrol.qrc">
-     <normaloff>:/files/images/devices/input-gaming.svg</normaloff>:/files/images/devices/input-gaming.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Joystick Configuration</string>
-   </property>
-   <property name="visible">
-    <bool>true</bool>
-   </property>
-  </action>
   <action name="actionSimulate">
    <property name="checkable">
     <bool>true</bool>
@@ -208,27 +194,6 @@
     <string>Simulate one vehicle to test and evaluate this application</string>
    </property>
   </action>
-  <action name="actionShow_Slugs_View">
-   <property name="icon">
-    <iconset resource="../../qgroundcontrol.qrc">
-     <normaloff>:/files/images/contrib/slugs.png</normaloff>:/files/images/contrib/slugs.png</iconset>
-   </property>
-   <property name="text">
-    <string>Show Slugs View</string>
-   </property>
-  </action>
-  <action name="actionJoystick_Settings">
-   <property name="icon">
-    <iconset resource="../../qgroundcontrol.qrc">
-     <normaloff>:/files/images/devices/input-gaming.svg</normaloff>:/files/images/devices/input-gaming.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Joystick Settings</string>
-   </property>
-   <property name="visible">
-    <bool>false</bool>
-   </property>
-  </action>
   <action name="actionOnline_Documentation">
    <property name="icon">
     <iconset resource="../../qgroundcontrol.qrc">
@@ -238,7 +203,7 @@
     <string>Online Documentation</string>
    </property>
   </action>
-  <action name="actionProject_Roadmap_2">
+  <action name="actionProject_Roadmap">
    <property name="icon">
     <iconset resource="../../qgroundcontrol.qrc">
      <normaloff>:/files/images/status/software-update-available.svg</normaloff>:/files/images/status/software-update-available.svg</iconset>
@@ -280,18 +245,6 @@
     <string>Analyze</string>
    </property>
   </action>
-  <action name="actionMavlinkView">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../../qgroundcontrol.qrc">
-     <normaloff>:/files/images/devices/network-wired.svg</normaloff>:/files/images/devices/network-wired.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Mavlink</string>
-   </property>
-  </action>
   <action name="actionFlightView">
    <property name="checkable">
     <bool>true</bool>
@@ -329,18 +282,6 @@
     <string>Mute Audio Output</string>
    </property>
   </action>
-  <action name="actionUnconnectedView">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../../qgroundcontrol.qrc">
-     <normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Unconnected</string>
-   </property>
-  </action>
   <action name="actionShutdownMAV">
    <property name="icon">
     <iconset resource="../../qgroundcontrol.qrc">
@@ -401,24 +342,6 @@
     <string>Load Custom Widget File</string>
    </property>
   </action>
-  <action name="actionFirmwareUpdateView">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../../qgroundcontrol.qrc">
-     <normaloff>:/files/images/status/software-update-available.svg</normaloff>:/files/images/status/software-update-available.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Firmware Update</string>
-   </property>
-   <property name="toolTip">
-    <string>Update the firmware of one of the connected autopilots</string>
-   </property>
-   <property name="visible">
-    <bool>false</bool>
-   </property>
-  </action>
   <action name="actionSetup">
    <property name="checkable">
     <bool>true</bool>