diff --git a/app/telemetry/MavlinkTelemetry.cpp b/app/telemetry/MavlinkTelemetry.cpp
index 46fd39271..450dfa938 100644
--- a/app/telemetry/MavlinkTelemetry.cpp
+++ b/app/telemetry/MavlinkTelemetry.cpp
@@ -133,28 +133,6 @@ void MavlinkTelemetry::process_mavlink_message(const mavlink_message_t& msg)
         //qDebug()<<"MavlinkTelemetry::XonProcessMavlinkMessage"<<msg.msgid<<"compid:"<<source_compid<<" source_sysid:"<<source_sysid;
         if(!m_fc_found){
             // For the fc we need to wait until we got an heartbeat
-            /*if(msg.msgid==MAVLINK_MSG_ID_HEARTBEAT){
-                qDebug()<<"Got non-openhd heartbeat";
-                // By default, we assume there is one additional non-openhd system - the FC
-                bool is_fc=true;
-                QSettings settings;
-                const bool dirty_enable_mavlink_fc_sys_id_check=settings.value("dirty_enable_mavlink_fc_sys_id_check",false).toBool();
-                if(dirty_enable_mavlink_fc_sys_id_check){
-                    // filtering, default off
-                    //const auto comp_ids=system->component_ids();
-                    //is_fc=mavsdk::helper::any_comp_id_autopilot(comp_ids);
-                }
-                if(is_fc){
-                    qDebug()<<"Found FC";
-                    // we got the flight controller
-                    FCMavlinkSystem::instance().set_system_id(source_sysid);
-                    m_fc_sys_id=source_sysid;
-                    m_fc_comp_id=source_compid;
-                    m_fc_found=true;
-                }else{
-                    qDebug()<<"Got weird system:"<<source_sysid;
-                }
-            }*/
             if(source_compid==MAV_COMP_ID_AUTOPILOT1){
                 FCMavlinkSystem::instance().set_system_id(source_sysid);
                 m_fc_sys_id=source_sysid;
diff --git a/app/videostreaming/gstreamer/gstrtpaudioplayer.cpp b/app/videostreaming/gstreamer/gstrtpaudioplayer.cpp
index 0c0abc369..0f3905745 100644
--- a/app/videostreaming/gstreamer/gstrtpaudioplayer.cpp
+++ b/app/videostreaming/gstreamer/gstrtpaudioplayer.cpp
@@ -96,6 +96,7 @@ void GstRtpAudioPlayer::start_playing()
         qDebug() << "gst_parse_launch error: " << error->message;
         //on_error("audio parse launch error");
         on_error(error->message);
+        m_gst_pipeline = nullptr;
         return;
     }
     if(!m_gst_pipeline || !(GST_IS_PIPELINE(m_gst_pipeline))){
diff --git a/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml b/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml
index 8ac4d8917..d23c6ba25 100644
--- a/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml
+++ b/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml
@@ -85,11 +85,12 @@ Rectangle {
                     Layout.leftMargin: 12
                 }
                 // air
-                Button{
+                Switch{
                     height: 23
                     text: "SHOW DEV OVERLAY"
-                    onClicked: {
-                        settings.show_dev_stats_overlay=!settings.show_dev_stats_overlay
+                    checked: settings.show_dev_stats_overlay
+                    onCheckedChanged: {
+                        settings.show_dev_stats_overlay=checked
                     }
                 }
 
diff --git a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
index b19fa1701..2b6d73d27 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
@@ -195,51 +195,6 @@ ScrollView {
                     onCheckedChanged: settings.dirty_enable_inav_hacks = checked
                 }
             }
-            SettingBaseElement{
-                m_short_description: "dirty_enable_mavlink_fc_sys_id_check"
-                 m_long_description: "Only accept FCs that explicitly expose themselves as autopilot - can fix issues with FC discovery in QOpenHD."
-
-                Switch {
-                    width: 32
-                    height: elementHeight
-                    anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
-
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-                    checked: settings.dirty_enable_mavlink_fc_sys_id_check
-                    onCheckedChanged: settings.dirty_enable_mavlink_fc_sys_id_check = checked
-                }
-            }
-
-            SettingBaseElement{
-                m_short_description: "dev_mavlink_via_tcp"
-                m_long_description: "Requires full restart. Connect via TCP instead of UDP. Requires matching server IP."
-                Switch {
-                    width: 32
-                    height: elementHeight
-                    anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-                    checked: settings.dev_mavlink_via_tcp
-                    onCheckedChanged: settings.dev_mavlink_via_tcp = checked
-                }
-            }
-            SettingBaseElement{
-                m_short_description: "dev_mavlink_tcp_ip"
-                m_long_description: "Requires full restart. IP of mavlink tcp server"
-                TextInput{
-                    id: ti_ip
-                    height: elementHeight
-                    anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    text: settings.dev_mavlink_tcp_ip
-                    cursorVisible: true
-                    inputMask: "999.999.999.999"
-                    onTextEdited: settings.dev_mavlink_tcp_ip = ti_ip.text
-                }
-            }
             SettingBaseElement{
                 m_short_description: "dev_wb_show_no_stbc_enabled_warning"
                 m_long_description: "Do not show the STBC recommended enabled message"
diff --git a/qml/ui/elements/AppSettings.qml b/qml/ui/elements/AppSettings.qml
index 558460c4f..bf603abe9 100644
--- a/qml/ui/elements/AppSettings.qml
+++ b/qml/ui/elements/AppSettings.qml
@@ -399,17 +399,11 @@ Settings {
 
     // really really dirty, i want to get rid of it as soon as possible
     property bool dirty_enable_inav_hacks: false
-    // FC discovery - can be annoying / tricky
-    property bool dirty_enable_mavlink_fc_sys_id_check: false
 
     property int custom_cursor_type: 0
     property int custom_cursor_scale: 1 // arbitrary scale values - higher == bigger,
     property bool enable_cursor_auto_hide: false
 
-    // experimental - mavlink via TCP
-    property bool dev_mavlink_via_tcp: false
-    property string dev_mavlink_tcp_ip: "0.0.0.0"
-
     // message can be removed if needed.
     property bool dev_wb_show_no_stbc_enabled_warning: false