diff --git a/src/ui/main/QGCViewModeSelection.cc b/src/ui/main/QGCViewModeSelection.cc
index 341b0d724ed9ad00bb440ff3ede8b473c2603e87..485fb5d9cc7329ff8010357dd5049ae2482dab4a 100644
--- a/src/ui/main/QGCViewModeSelection.cc
+++ b/src/ui/main/QGCViewModeSelection.cc
@@ -13,11 +13,7 @@ QGCViewModeSelection::QGCViewModeSelection(QWidget *parent) :
     connect(ui->viewModeGeneric, SIGNAL(clicked()), this, SLOT(selectGeneric()));
     connect(ui->viewModeAR, SIGNAL(clicked()), this, SLOT(selectWifi()));
     connect(ui->viewModePX4, SIGNAL(clicked()), this, SLOT(selectPX4()));
-    connect(ui->viewModeAPM, SIGNAL(clicked()), this, SLOT(selectAPM()));
     connect(ui->notAgainCheckBox, SIGNAL(clicked(bool)), this, SIGNAL(settingsStorageRequested(bool)));
-
-    // XXX we need to revive the APM support or remove it completely
-    ui->viewModeAPM->hide();
 }
 
 QGCViewModeSelection::~QGCViewModeSelection()
@@ -48,10 +44,4 @@ void QGCViewModeSelection::selectPX4() {
     emit customViewModeSelected(MainWindow::CUSTOM_MODE_PX4);
     mode = MainWindow::CUSTOM_MODE_PX4;
     selected = true;
-}
-
-void QGCViewModeSelection::selectAPM() {
-    emit customViewModeSelected(MainWindow::CUSTOM_MODE_APM);
-    mode = MainWindow::CUSTOM_MODE_APM;
-    selected = true;
-}
+}
\ No newline at end of file
diff --git a/src/ui/main/QGCViewModeSelection.h b/src/ui/main/QGCViewModeSelection.h
index 9a3f5826efeebaad0e00f57ebd355fe29e03d7d2..1d1e81d702b64c063a8c32c97c3a7cfd35742255 100644
--- a/src/ui/main/QGCViewModeSelection.h
+++ b/src/ui/main/QGCViewModeSelection.h
@@ -22,7 +22,6 @@ public slots:
 
     void selectGeneric();
     void selectPX4();
-    void selectAPM();
     void selectWifi();
 
 signals:
diff --git a/src/ui/main/QGCViewModeSelection.ui b/src/ui/main/QGCViewModeSelection.ui
index b45aa7813db071c7d7f30d7eec4581e0c1444b53..968a888a602639cda4616dca15cb9bfb1dd952a5 100644
--- a/src/ui/main/QGCViewModeSelection.ui
+++ b/src/ui/main/QGCViewModeSelection.ui
@@ -67,13 +67,6 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="3">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>APM Autopilot</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="2">
        <widget class="QLabel" name="label_2">
         <property name="text">
@@ -81,23 +74,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
-       <widget class="QPushButton" name="viewModeAPM">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../../../qgroundcontrol.qrc">
-          <normaloff>:/files/images/actions/qgroundcontrol-apm.svg</normaloff>:/files/images/actions/qgroundcontrol-apm.svg</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>120</width>
-          <height>120</height>
-         </size>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="1">
        <widget class="QLabel" name="label_4">
         <property name="text">