diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 5c692c989e85fd103aefbfc3ff2e4a63297a3cc0..80b6814918ff78303c235e9d816b96aaea3fbf62 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -2045,27 +2045,6 @@ void MainWindow::loadMAVLinkView()
     }
 }
 
-//void MainWindow::loadDataView(QString fileName)
-//{
-//    // Plot is now selected, now load data from file
-//    if (dataView)
-//    {
-//        //dataView->setCentralWidget(new QGCDataPlot2D(this));
-//        QGCDataPlot2D *plot = qobject_cast<QGCDataPlot2D*>(dataView->centralWidget());
-//        if (plot)
-//        {
-//            plot->loadFile(fileName);
-//        }
-//    }
-//    /*QStackedWidget *centerStack = dynamic_cast<QStackedWidget*>(centralWidget());
-//    if (centerStack)
-//    {
-//        centerStack->setCurrentWidget(dataView);
-//        dataplotWidget->loadFile(fileName);
-//    }*/
-//}
-
-
 QList<QAction*> MainWindow::listLinkMenuActions()
 {
     return ui.menuNetwork->actions();
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index aa6545473a7bc8e5d2340a2d9d898202c434851c..8e2ee961b3ab8df7ca88b9285d3db0f0d8de8d8f 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -51,20 +51,20 @@ This file is part of the QGROUNDCONTROL project
 #include "ObjectDetectionView.h"
 #include "submainwindow.h"
 #include "input/JoystickInput.h"
-#if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
+#if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
 #include "Mouse6dofInput.h"
-#endif // QGC_MOUSE_ENABLED_WIN
+#endif // QGC_MOUSE_ENABLED_WIN
 #include "DebugConsole.h"
 #include "ParameterInterface.h"
 #include "HDDisplay.h"
 #include "WatchdogControl.h"
-#include "HSIDisplay.h"
-#include "QGCRemoteControlView.h"
-#include "opmapcontrol.h"
-#ifdef QGC_GOOGLE_EARTH_ENABLED
-#include "QGCGoogleEarthView.h"
-#endif
-#include "QGCToolBar.h"
+#include "HSIDisplay.h"
+#include "QGCRemoteControlView.h"
+#include "opmapcontrol.h"
+#ifdef QGC_GOOGLE_EARTH_ENABLED
+#include "QGCGoogleEarthView.h"
+#endif
+#include "QGCToolBar.h"
 #include "SlugsDataSensorView.h"
 #include "LogCompressor.h"
 
@@ -281,9 +281,6 @@ public slots:
 
     void closeEvent(QCloseEvent* event);
 
-    /** @brief Load data view, allowing to plot flight data */
-//    void loadDataView(QString fileName);
-
     /**
      * @brief Shows a Widget from the center stack based on the action sender
      *
@@ -307,10 +304,10 @@ signals:
     /** Emitted when any value changes from any source */
     void valueChanged(const int uasId, const QString& name, const QString& unit, const QVariant& value, const quint64 msec);
 
-#ifdef QGC_MOUSE_ENABLED_LINUX
+#ifdef QGC_MOUSE_ENABLED_LINUX
     /** @brief Forward X11Event to catch 3DMouse inputs */
     void x11EventOccured(XEvent *event);
-#endif //QGC_MOUSE_ENABLED_LINUX
+#endif //QGC_MOUSE_ENABLED_LINUX
 
 public:
     QGCMAVLinkLogPlayer* getLogPlayer()
@@ -419,13 +416,13 @@ protected:
     //QPointer<QGCMapTool> mapWidget;
     //QPointer<XMLCommProtocolWidget> protocolWidget;
     //QPointer<QGCDataPlot2D> dataplotWidget;
-#ifdef QGC_OSG_ENABLED
-    QPointer<QWidget> q3DWidget;
-#endif
-#ifdef QGC_GOOGLE_EARTH_ENABLED
-	QPointer<QGCGoogleEarthView> earthWidget;
-#endif
-    QPointer<QGCFirmwareUpdate> firmwareUpdateWidget;
+#ifdef QGC_OSG_ENABLED
+    QPointer<QWidget> q3DWidget;
+#endif
+#ifdef QGC_GOOGLE_EARTH_ENABLED
+	QPointer<QGCGoogleEarthView> earthWidget;
+#endif
+    QPointer<QGCFirmwareUpdate> firmwareUpdateWidget;
 
     // Dock widgets
     QPointer<QDockWidget> controlDockWidget;
@@ -471,17 +468,17 @@ protected:
 
     JoystickInput* joystick;
 
-#ifdef QGC_MOUSE_ENABLED_WIN
+#ifdef QGC_MOUSE_ENABLED_WIN
     /** @brief 3d Mouse support (WIN only) */
     Mouse3DInput* mouseInput;               ///< 3dConnexion 3dMouse SDK
     Mouse6dofInput* mouse;                  ///< Implementation for 3dMouse input
-#endif // QGC_MOUSE_ENABLED_WIN
+#endif // QGC_MOUSE_ENABLED_WIN
 
-#ifdef QGC_MOUSE_ENABLED_LINUX
+#ifdef QGC_MOUSE_ENABLED_LINUX
     /** @brief Reimplementation of X11Event to handle 3dMouse Events (magellan) */
     bool x11Event(XEvent *event);
     Mouse6dofInput* mouse;                  ///< Implementation for 3dMouse input
-#endif // QGC_MOUSE_ENABLED_LINUX
+#endif // QGC_MOUSE_ENABLED_LINUX
 
     /** User interface actions **/
     QAction* connectUASAct;
diff --git a/src/ui/configuration/FlightModeConfig.cc b/src/ui/configuration/FlightModeConfig.cc
index 5fe932de10fd949c43f02daf18279f7bc85e0822..62a46c7ca818a1624f890414e24aab6d23e8e4e8 100644
--- a/src/ui/configuration/FlightModeConfig.cc
+++ b/src/ui/configuration/FlightModeConfig.cc
@@ -216,12 +216,10 @@ void FlightModeConfig::saveButtonClicked(void)
 // rc channel value.
 void FlightModeConfig::remoteControlChannelRawChanged(int chan, float val)
 {
-    qDebug() << chan << val << _modeSwitchRCChannel;
     // Until we get the _modeSwitchRCChannel value from a parameter it will be set
     // to -1, which is an invalid channel thus the labels won't update
     if (chan == _modeSwitchRCChannel)
     {
-        qDebug() << chan << val;
         size_t highlightIndex = _cModes; // initialize to unreachable index
         
         for (size_t i=0; i<_cModes; i++) {
diff --git a/src/ui/designer/QGCToolWidget.h b/src/ui/designer/QGCToolWidget.h
index 7ab9ef679d8ba35752ad113c58727d77bf446f5c..847138da51f3970b8bcb5effb0a0d51bed0a43d2 100644
--- a/src/ui/designer/QGCToolWidget.h
+++ b/src/ui/designer/QGCToolWidget.h
@@ -48,6 +48,7 @@ public slots:
     void importWidget();
     /** @brief Store all widgets of this type to QSettings */
     void storeWidgetsToSettings() { QSettings settings; QGCToolWidget::storeWidgetsToSettings(settings); }
+    void showLabel(QString name,int num);
 
 public:
     void loadSettings(QVariantMap& settings);
@@ -61,7 +62,6 @@ public:
     QList<QString> getParamList();
     void setParameterValue(int uas, int component, QString parameterName, const QVariant value);
     bool fromMetaData() const { return isFromMetaData; }
-    void showLabel(QString name,int num);
 
 signals:
     void titleChanged(const QString &title);
diff --git a/src/ui/linechart/Linecharts.cc b/src/ui/linechart/Linecharts.cc
index 19469b8b690081c79f6755f33d32ec6c7a210c76..750e082020d02f0663b63ddbe40b48223c1c8543 100644
--- a/src/ui/linechart/Linecharts.cc
+++ b/src/ui/linechart/Linecharts.cc
@@ -22,8 +22,6 @@ Linecharts::Linecharts(QWidget *parent) :
             this, SLOT(addSystem(UASInterface*)));
     connect(UASManager::instance(), SIGNAL(activeUASSet(int)),
             this, SLOT(selectSystem(int)));
-    connect(this, SIGNAL(logfileWritten(QString)),
-            MainWindow::instance(), SLOT(loadDataView(QString)));
 }
 
 void Linecharts::showEvent(QShowEvent* event)
diff --git a/src/ui/uas/UASView.cc b/src/ui/uas/UASView.cc
index 9b051369dbc48283dafe839d50705e0da8f7cb3c..61843f6092ed791adcb733bfd6367b856e834f3c 100644
--- a/src/ui/uas/UASView.cc
+++ b/src/ui/uas/UASView.cc
@@ -105,9 +105,6 @@ UASView::UASView(UASInterface* uas, QWidget *parent) :
     connect(uas, SIGNAL(textMessageReceived(int,int,int,QString)), this, SLOT(showStatusText(int, int, int, QString)));
     connect(uas, SIGNAL(navModeChanged(int, int, QString)), this, SLOT(updateNavMode(int, int, QString)));
 
-    // Setup UAS selection
-    connect(this, SIGNAL(clicked(bool)), this, SLOT(setUASasActive(bool)));
-
     // Setup user interaction
     connect(m_ui->liftoffButton, SIGNAL(clicked()), uas, SLOT(launch()));
     connect(m_ui->haltButton, SIGNAL(clicked()), uas, SLOT(halt()));