diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index ea1c451c800806c3cf3c95c9ffc9e4bc886fbce5..236f7f9fad6c5acf8d5492d32c475f51089e5573 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -302,7 +302,7 @@ void MainWindow::_buildCommonWidgets(void)
     // Add generic MAVLink decoder
     // TODO: This is never deleted
     mavlinkDecoder = new MAVLinkDecoder(qgcApp()->toolbox()->mavlinkProtocol(), this);
-    connect(mavlinkDecoder, &MAVLinkDecoder::valueChanged, this, &MainWindow::valueChanged);
+    connect(mavlinkDecoder.data(), &MAVLinkDecoder::valueChanged, this, &MainWindow::valueChanged);
 
     // Log player
     // TODO: Make this optional with a preferences setting or under a "View" menu
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index ca0d4ef2fcd83416019703ac6f266a59d849a245..4c23d313b39f3940205bc04ff78e4237757d411d 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -206,12 +206,6 @@ private:
 
     void _openUrl(const QString& url, const QString& errorMessage);
 
-    // Center widgets
-    QPointer<QWidget> _planView;
-    QPointer<QWidget> _flightView;
-    QPointer<QWidget> _setupView;
-    QPointer<QWidget> _missionEditorView;
-
 #ifndef __mobile__
     QMap<QString, QGCDockWidget*>   _mapName2DockWidget;
     QMap<QString, QAction*>         _mapName2Action;