diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 33635e7d243c291e8d647d6fa9d3848f938d5a17..4018eb9a06f9f49ffa4f6952ebd98994c7503d96 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -542,7 +542,6 @@ QGCView {
                     RoundButton {
                         id:             addShapeButton
                         buttonImage:    "/qmlimages/MapDrawShape.svg"
-                        visible:        QGroundControl.experimentalSurvey
                         lightBorders:   _lightWidgetBorders
 
                         onClicked: {
diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml
index 61cd8d9a167e5f2f81279d47604ea95207d77fe8..2caf0343978449626056879e94bcb4a8619c0dcb 100644
--- a/src/MissionEditor/SurveyItemEditor.qml
+++ b/src/MissionEditor/SurveyItemEditor.qml
@@ -43,8 +43,9 @@ Rectangle {
         }
 
         QGCLabel {
-            text:       qsTr("Fly a grid pattern over a defined area.")
-            wrapMode:   Text.WordWrap
+            wrapMode:       Text.WordWrap
+            font.pointSize: ScreenTools.smallFontPointSize
+            text:           qsTr("Work in progress, be careful!")
         }
 
         Repeater {
diff --git a/src/QmlControls/MissionItemEditor.qml b/src/QmlControls/MissionItemEditor.qml
index bb2ba18985b13592bd162edfd28bbcf233fd024f..b2f0bc1091fba7b52329e52a9fd9901220105058 100644
--- a/src/QmlControls/MissionItemEditor.qml
+++ b/src/QmlControls/MissionItemEditor.qml
@@ -143,7 +143,7 @@ Rectangle {
         verticalAlignment:  Text.AlignVCenter
         text:               missionItem.sequenceNumber == 0 ?
                                 qsTr("Planned Home Position") :
-                                (missionItem.isSimpleItem ? missionItem.commandName : qsTr("Survey"))
+                                (missionItem.isSimpleItem ? missionItem.commandName : qsTr("Survey (WIP)"))
         color:              _outerTextColor
     }
 
diff --git a/src/QmlControls/QGroundControlQmlGlobal.cc b/src/QmlControls/QGroundControlQmlGlobal.cc
index 264b5f7e61dac1a48fc112b4d8a3c1663aeca86a..ac1556dd1a1150e4d70e80288a66ffc3dd9568c2 100644
--- a/src/QmlControls/QGroundControlQmlGlobal.cc
+++ b/src/QmlControls/QGroundControlQmlGlobal.cc
@@ -207,21 +207,6 @@ void QGroundControlQmlGlobal::setBaseFontPointSize(qreal size)
     }
 }
 
-bool QGroundControlQmlGlobal::experimentalSurvey(void) const
-{
-    QSettings settings;
-
-    return settings.value("ExperimentalSurvey", false).toBool();
-}
-
-void QGroundControlQmlGlobal::setExperimentalSurvey(bool experimentalSurvey)
-{
-    QSettings settings;
-
-    settings.setValue("ExperimentalSurvey", experimentalSurvey);
-    emit experimentalSurveyChanged(experimentalSurvey);
-}
-
 Fact* QGroundControlQmlGlobal::offlineEditingFirmwareType(void)
 {
     if (!_offlineEditingFirmwareTypeFact) {
diff --git a/src/QmlControls/QGroundControlQmlGlobal.h b/src/QmlControls/QGroundControlQmlGlobal.h
index dd09600ea51290e96e632ad1c442e535357809fb..c2b030fad8c56c503ab7318cb129ad02c839102d 100644
--- a/src/QmlControls/QGroundControlQmlGlobal.h
+++ b/src/QmlControls/QGroundControlQmlGlobal.h
@@ -93,9 +93,6 @@ public:
     Q_PROPERTY(QString  missionFileExtension    READ missionFileExtension   CONSTANT)
     Q_PROPERTY(QString  telemetryFileExtension  READ telemetryFileExtension CONSTANT)
 
-    /// @ return: true: experimental survey ip code is turned on
-    Q_PROPERTY(bool experimentalSurvey READ experimentalSurvey WRITE setExperimentalSurvey NOTIFY experimentalSurveyChanged)
-
     /// Returns the string for distance units which has configued by user
     Q_PROPERTY(QString appSettingsDistanceUnitsString READ appSettingsDistanceUnitsString CONSTANT)
 
@@ -178,9 +175,6 @@ public:
     void    setIsVersionCheckEnabled    (bool enable);
     void    setMavlinkSystemID          (int  id);
 
-    bool experimentalSurvey(void) const;
-    void setExperimentalSurvey(bool experimentalSurvey);
-
     QString parameterFileExtension(void) const  { return QGCApplication::parameterFileExtension; }
     QString missionFileExtension(void) const    { return QGCApplication::missionFileExtension; }
     QString telemetryFileExtension(void) const  { return QGCApplication::telemetryFileExtension; }
@@ -200,7 +194,6 @@ signals:
     void mavlinkSystemIDChanged         (int id);
     void flightMapPositionChanged       (QGeoCoordinate flightMapPosition);
     void flightMapZoomChanged           (double flightMapZoom);
-    void experimentalSurveyChanged      (bool experimentalSurvey);
 
 private:
     FlightMapSettings*      _flightMapSettings;
diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml
index 9a3e5dfc8835221217527cf4318513b1b1da1b08..f3edf651500467c0d175cecfb1652ecde468daeb 100644
--- a/src/ui/preferences/GeneralSettings.qml
+++ b/src/ui/preferences/GeneralSettings.qml
@@ -398,14 +398,6 @@ QGCView {
                     height: ScreenTools.defaultFontPixelHeight / 2
                     width:  parent.width
                 }
-
-                //-----------------------------------------------------------------
-                //-- Experimental Survey settings
-                QGCCheckBox {
-                    text:       qsTr("Experimental Survey [WIP - no bugs reports please]")
-                    checked:    QGroundControl.experimentalSurvey
-                    onClicked:  QGroundControl.experimentalSurvey = checked
-                }
             }
         }
     } // QGCViewPanel