diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml
index 1b2a4c94ee7a67411e40f9ceb564e7d266d11da9..75dfc74a0c535877141690fe19ee4c3105b00c78 100644
--- a/src/FlightMap/FlightMap.qml
+++ b/src/FlightMap/FlightMap.qml
@@ -76,8 +76,6 @@ Map {
         }
     }
 
-    ExclusiveGroup { id: mapTypeGroup }
-
     // Center map to gcs location
     onGcsPositionChanged: {
         if (gcsPosition.isValid && allowGCSLocationCenter && !firstGCSPositionReceived && !firstVehiclePositionReceived) {
diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml
index d798b4f711c2f8b06eacfd48b7b70bafab5869b5..d1efda9de9cc0f23814fd61c8c3027c60ce2bc8e 100644
--- a/src/PlanView/MissionItemEditor.qml
+++ b/src/PlanView/MissionItemEditor.qml
@@ -23,7 +23,6 @@ Rectangle {
     property var    masterController
     property var    missionItem         ///< MissionItem associated with this editor
     property bool   readOnly            ///< true: read only view, false: full editing view
-    property var    rootQgcView
 
     signal clicked
     signal remove
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index f5a3e030ee1056cc05421999086f58e6091fe838..068cbb71f2aa7d0796e1be555bfb0c6504bde1ee 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -31,7 +31,6 @@ import QGroundControl.Airmap            1.0
 /// Mission Editor
 
 Item {
-    id:         _root
 
     property bool planControlColapsed: false
 
@@ -440,8 +439,6 @@ Item {
             onCenterChanged:    updateAirspace(false)
 
             MouseArea {
-                //-- It's a whole lot faster to just fill parent and deal with top offset below
-                //   than computing the coordinate offset.
                 anchors.fill: parent
                 onClicked: {
                     // Take focus to close any previous editing
@@ -807,7 +804,6 @@ Item {
                         missionItem:        object
                         width:              parent.width
                         readOnly:           false
-                        rootQgcView:        _root
                         onClicked:  _missionController.setCurrentPlanViewIndex(object.sequenceNumber, false)
                         onRemove: {
                             var removeIndex = index