diff --git a/QGCApplication.pro b/QGCApplication.pro
index 1087d22aafabeb85470fb9bf594b5bff445eefa6..1e2ca3715b281586ef1f1956855817acc8f0b14b 100644
--- a/QGCApplication.pro
+++ b/QGCApplication.pro
@@ -335,7 +335,6 @@ HEADERS += \
     src/ui/WaypointViewOnlyView.h \
     src/ViewWidgets/CustomCommandWidget.h \
     src/ViewWidgets/CustomCommandWidgetController.h \
-    src/ViewWidgets/ParameterEditorWidget.h \
     src/ViewWidgets/ViewWidgetController.h \
     src/MissionItem.h \
     src/AutoPilotPlugins/PX4/PX4AirframeLoader.h
@@ -464,7 +463,6 @@ SOURCES += \
     src/ui/WaypointViewOnlyView.cc \
     src/ViewWidgets/CustomCommandWidget.cc \
     src/ViewWidgets/CustomCommandWidgetController.cc \
-    src/ViewWidgets/ParameterEditorWidget.cc \
     src/ViewWidgets/ViewWidgetController.cc \
     src/MissionItem.cc \
     src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 117e51de5cdad1286e0aba24a76177f33635261c..34396fe3381a42bc3984c2e630b007e6af047dfe 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -110,7 +110,6 @@
         <file alias="SetupParameterEditor.qml">src/VehicleSetup/SetupParameterEditor.qml</file>
 
         <file alias="ScreenToolsFontQuery.qml">src/QmlControls/ScreenToolsFontQuery.qml</file>
-        <file alias="ParameterEditorWidget.qml">src/ViewWidgets/ParameterEditorWidget.qml</file>
         <file alias="CustomCommandWidget.qml">src/ViewWidgets/CustomCommandWidget.qml</file>
         <file alias="SafetyComponent.qml">src/AutoPilotPlugins/PX4/SafetyComponent.qml</file>
         <file alias="RadioComponent.qml">src/AutoPilotPlugins/PX4/RadioComponent.qml</file>
diff --git a/src/VehicleSetup/SetupParameterEditor.qml b/src/VehicleSetup/SetupParameterEditor.qml
index 5856f086b8046d16831e7ab8b48fcbb921e9d57c..61265880c45d22a6b136633ec04c2a43eca3c09b 100644
--- a/src/VehicleSetup/SetupParameterEditor.qml
+++ b/src/VehicleSetup/SetupParameterEditor.qml
@@ -29,5 +29,5 @@ import QGroundControl.ScreenTools 1.0
 import QGroundControl.Palette 1.0
 
 ParameterEditor {
-    fullMode: true
+
 }
diff --git a/src/ViewWidgets/ParameterEditorWidget.cc b/src/ViewWidgets/ParameterEditorWidget.cc
deleted file mode 100644
index a1151c038cc68c652dde1aaa40aa98c5203736e1..0000000000000000000000000000000000000000
--- a/src/ViewWidgets/ParameterEditorWidget.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-This file is part of the QGROUNDCONTROL project
-
-    QGROUNDCONTROL is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    QGROUNDCONTROL is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-/**
- * @file
- *   @brief Definition of class ParameterEditorWidget
- *   @author Lorenz Meier <mavteam@student.ethz.ch>
- *
- */
-
-#include "ParameterEditorWidget.h"
-
-ParameterEditorWidget::ParameterEditorWidget(QWidget *parent) :
-    QGCQmlWidgetHolder(parent)
-{
-	setSource(QUrl::fromUserInput("qrc:/qml/ParameterEditorWidget.qml"));
-}
diff --git a/src/ViewWidgets/ParameterEditorWidget.h b/src/ViewWidgets/ParameterEditorWidget.h
deleted file mode 100644
index 809d647e6d68b48b8f574d1a13f5886034f59028..0000000000000000000000000000000000000000
--- a/src/ViewWidgets/ParameterEditorWidget.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-This file is part of the QGROUNDCONTROL project
-
-    QGROUNDCONTROL is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    QGROUNDCONTROL is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-/// @file
-///     @author Don Gagne <don@thegagnes.com>
-
-#ifndef PARAMETEREDITORWIDGET_H
-#define PARAMETEREDITORWIDGET_H
-
-#include "QGCQmlWidgetHolder.h"
-
-class ParameterEditorWidget : public QGCQmlWidgetHolder
-{
-    Q_OBJECT
-	
-public:
-    ParameterEditorWidget(QWidget *parent = 0);
-};
-
-#endif
diff --git a/src/ViewWidgets/ParameterEditorWidget.qml b/src/ViewWidgets/ParameterEditorWidget.qml
deleted file mode 100644
index 234dee17ab79a6de8dd9d061a01c64e1527df879..0000000000000000000000000000000000000000
--- a/src/ViewWidgets/ParameterEditorWidget.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-This file is part of the QGROUNDCONTROL project
-
-QGROUNDCONTROL is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-QGROUNDCONTROL is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-/// @file
-///     @author Don Gagne <don@thegagnes.com>
-
-import QtQuick 2.2
-
-import QGroundControl.Palette 1.0
-import QGroundControl.Controls 1.0
-
-ViewWidget {
-	connectedComponent: editorComponent
-
-	Component {
-		id: editorComponent
-
-		ParameterEditor {
-			fullMode: false
-		}
-	}
-}
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index a69a0bb2d22c2079a4d729724d29bb770e5f2ff6..dc01ef034d74a77a4c0f71066036eae6ea7316f9 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -90,7 +90,6 @@ const char* MainWindow::_uasControlDockWidgetName = "UNMANNED_SYSTEM_CONTROL_DOC
 const char* MainWindow::_uasListDockWidgetName = "UNMANNED_SYSTEM_LIST_DOCKWIDGET";
 const char* MainWindow::_waypointsDockWidgetName = "WAYPOINT_LIST_DOCKWIDGET";
 const char* MainWindow::_mavlinkDockWidgetName = "MAVLINK_INSPECTOR_DOCKWIDGET";
-const char* MainWindow::_parametersDockWidgetName = "PARAMETER_INTERFACE_DOCKWIDGET";
 const char* MainWindow::_customCommandWidgetName = "CUSTOM_COMMAND_DOCKWIDGET";
 const char* MainWindow::_filesDockWidgetName = "FILE_VIEW_DOCKWIDGET";
 const char* MainWindow::_uasStatusDetailsDockWidgetName = "UAS_STATUS_DETAILS_DOCKWIDGET";
@@ -393,7 +392,6 @@ void MainWindow::_buildCommonWidgets(void)
         { _uasListDockWidgetName,           "Unmanned Systems",         Qt::RightDockWidgetArea },
         { _waypointsDockWidgetName,         "Mission Plan",             Qt::BottomDockWidgetArea },
         { _mavlinkDockWidgetName,           "MAVLink Inspector",        Qt::RightDockWidgetArea },
-        { _parametersDockWidgetName,        "Parameter Editor",			Qt::RightDockWidgetArea },
         { _customCommandWidgetName,         "Custom Command",			Qt::RightDockWidgetArea },
         { _filesDockWidgetName,             "Onboard Files",            Qt::RightDockWidgetArea },
         { _uasStatusDetailsDockWidgetName,  "Status Details",           Qt::RightDockWidgetArea },
@@ -497,8 +495,6 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName)
         widget = new QGCWaypointListMulti(this);
     } else if (widgetName == _mavlinkDockWidgetName) {
         widget = new QGCMAVLinkInspector(MAVLinkProtocol::instance(),this);
-    } else if (widgetName == _parametersDockWidgetName) {
-        widget = new ParameterEditorWidget(this);
     } else if (widgetName == _customCommandWidgetName) {
         widget = new CustomCommandWidget(this);
     } else if (widgetName == _filesDockWidgetName) {
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 5d64f5457abce65f9990d5575fafa1d2227586e2..ed76bbc4a887807e621182fafa674aee3b493f9e 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -49,7 +49,6 @@ This file is part of the QGROUNDCONTROL project
 #if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
 #include "Mouse6dofInput.h"
 #endif // QGC_MOUSE_ENABLED_WIN
-#include "ParameterEditorWidget.h"
 #include "opmapcontrol.h"
 #include "MainToolBar.h"
 #include "LogCompressor.h"
@@ -291,7 +290,6 @@ private:
     static const char* _uasListDockWidgetName;
     static const char* _waypointsDockWidgetName;
     static const char* _mavlinkDockWidgetName;
-    static const char* _parametersDockWidgetName;
     static const char* _customCommandWidgetName;
     static const char* _filesDockWidgetName;
     static const char* _uasStatusDetailsDockWidgetName;