diff --git a/src/comm/LinkConfiguration.h b/src/comm/LinkConfiguration.h
index 0299fafe5b01fd7b74c1667de5b44ff141af1509..4165236870800ca95ea8bbfc4e2edb7e9a1e6ea3 100644
--- a/src/comm/LinkConfiguration.h
+++ b/src/comm/LinkConfiguration.h
@@ -30,11 +30,9 @@ public:
     Q_PROPERTY(LinkType         linkType            READ type                                   CONSTANT)
     Q_PROPERTY(bool             dynamic             READ isDynamic      WRITE setDynamic        NOTIFY dynamicChanged)
     Q_PROPERTY(bool             autoConnect         READ isAutoConnect  WRITE setAutoConnect    NOTIFY autoConnectChanged)
-    Q_PROPERTY(bool             autoConnectAllowed  READ isAutoConnectAllowed                   CONSTANT)
     Q_PROPERTY(QString          settingsURL         READ settingsURL                            CONSTANT)
     Q_PROPERTY(QString          settingsTitle       READ settingsTitle                          CONSTANT)
     Q_PROPERTY(bool             highLatency         READ isHighLatency  WRITE setHighLatency    NOTIFY highLatencyChanged)
-    Q_PROPERTY(bool             highLatencyAllowed  READ isHighLatencyAllowed                   CONSTANT)
 
     // Property accessors
 
@@ -90,20 +88,6 @@ public:
 
     /// Virtual Methods
 
-    /*!
-     *
-     * Is Auto Connect allowed for this type?
-     * @return True if this type can be set as an Auto Connect configuration
-     */
-    virtual bool isAutoConnectAllowed() { return false; }
-
-    /*!
-     *
-     * Is High Latency allowed for this type?
-     * @return True if this type can be set as an High Latency configuration
-     */
-    virtual bool isHighLatencyAllowed() { return false; }
-
     /*!
      * @brief Connection type
      *
diff --git a/src/comm/SerialLink.h b/src/comm/SerialLink.h
index b62758cf5fc473a776f8eac8291377eab406d474..d5d5e748f6d6ddc65dd7fe3f08c143ca50af52a3 100644
--- a/src/comm/SerialLink.h
+++ b/src/comm/SerialLink.h
@@ -76,7 +76,6 @@ public:
     /// From LinkConfiguration
     LinkType    type            () { return LinkConfiguration::TypeSerial; }
     void        copyFrom        (LinkConfiguration* source);
-    bool        isHighLatencyAllowed () { return true; }
     void        loadSettings    (QSettings& settings, const QString& root);
     void        saveSettings    (QSettings& settings, const QString& root);
     void        updateSettings  ();
diff --git a/src/comm/TCPLink.h b/src/comm/TCPLink.h
index 543a4956f9dae002ed89edef16199a04786d6138..93544ee0768f4b86f612972991c0ce22ca5c8662 100644
--- a/src/comm/TCPLink.h
+++ b/src/comm/TCPLink.h
@@ -52,7 +52,6 @@ public:
     //LinkConfiguration overrides
     LinkType    type                (void) override                                         { return LinkConfiguration::TypeTcp; }
     void        copyFrom            (LinkConfiguration* source) override;
-    bool        isHighLatencyAllowed(void) override                                         { return true; }
     void        loadSettings        (QSettings& settings, const QString& root) override;
     void        saveSettings        (QSettings& settings, const QString& root) override;
     QString     settingsURL         (void) override                                         { return "TcpSettings.qml"; }
diff --git a/src/comm/UDPLink.h b/src/comm/UDPLink.h
index 97f47fea041a8ea676815ed61e1463a402564587..6995a9953a8e4a2090f8dc7f6a2b2b8f65d3b109 100644
--- a/src/comm/UDPLink.h
+++ b/src/comm/UDPLink.h
@@ -75,8 +75,6 @@ public:
     void        copyFrom             (LinkConfiguration* source) override;
     void        loadSettings         (QSettings& settings, const QString& root) override;
     void        saveSettings         (QSettings& settings, const QString& root) override;
-    bool        isAutoConnectAllowed (void) override                                        { return true; }
-    bool        isHighLatencyAllowed (void) override                                        { return true; }
     QString     settingsURL          (void) override                                        { return "UdpSettings.qml"; }
     QString     settingsTitle        (void) override                                        { return tr("UDP Link Settings"); }
 
diff --git a/src/ui/preferences/LinkSettings.qml b/src/ui/preferences/LinkSettings.qml
index 02e468e6b7a02cc645a47783ed8459025ce6f6cc..7e9c93c57850a2c1d8cf0fd87ab6e53de0e09079 100644
--- a/src/ui/preferences/LinkSettings.qml
+++ b/src/ui/preferences/LinkSettings.qml
@@ -300,7 +300,6 @@ Rectangle {
                             QGCCheckBox {
                                 text:               qsTr("Automatically Connect on Start")
                                 checked:            false
-                                enabled:            editConfig ? editConfig.autoConnectAllowed : false
                                 onCheckedChanged: {
                                     if(editConfig) {
                                         editConfig.autoConnect = checked
@@ -314,7 +313,6 @@ Rectangle {
                             QGCCheckBox {
                                 text:               qsTr("High Latency")
                                 checked:            false
-                                enabled:            editConfig ? editConfig.highLatencyAllowed : false
                                 onCheckedChanged: {
                                     if(editConfig) {
                                         editConfig.highLatency = checked