diff --git a/src/cfclient/configs/config.json b/src/cfclient/configs/config.json
index 82bb36e510..bb92591efe 100644
--- a/src/cfclient/configs/config.json
+++ b/src/cfclient/configs/config.json
@@ -14,7 +14,6 @@
     "max_rp": 30,
     "client_side_xmode": false,
     "auto_reconnect": false,
-    "keep_alive": false,
     "device_config_mapping": {},
     "enable_debug_driver": false,
     "input_device_blacklist": "(VirtualBox|VMware)",
diff --git a/src/cfclient/ui/main.py b/src/cfclient/ui/main.py
index e8ad337002..64f5929a1d 100644
--- a/src/cfclient/ui/main.py
+++ b/src/cfclient/ui/main.py
@@ -244,11 +244,6 @@ def __init__(self, *args):
             self._auto_reconnect_changed)
         self.autoReconnectCheckBox.setChecked(Config().get("auto_reconnect"))
 
-        self._keep_alive_enabled = Config().get("keep_alive")
-        self.keepAliveCheckBox.toggled.connect(
-            self._keep_alive_changed)
-        self.keepAliveCheckBox.setChecked(Config().get("keep_alive"))
-
         self._disable_input = False
 
         self.joystickReader.input_updated.add_callback(
@@ -556,19 +551,6 @@ def _auto_reconnect_changed(self, checked):
         Config().set("auto_reconnect", checked)
         logger.info("Auto reconnect enabled: {}".format(checked))
 
-    def _keep_alive_changed(self, checked):
-        self._keep_alive_enabled = checked
-        Config().set("keep_alive", checked)
-        logger.info("Keep alive enabled: {}".format(checked))
-
-        if checked:
-            cflib.crtp.radiodriver.set_retries_before_disconnect(99999999999999999)  # never disconnect :)
-            cflib.crtp.radiodriver.set_retries(3)
-        else:
-            cflib.crtp.radiodriver.set_retries_before_disconnect(1500) # default
-            cflib.crtp.radiodriver.set_retries(3)
-        
-
     def _show_connect_dialog(self):
         self.logConfigDialogue.show()
 
diff --git a/src/cfclient/ui/main.ui b/src/cfclient/ui/main.ui
index f754129a8a..e2f4e36939 100644
--- a/src/cfclient/ui/main.ui
+++ b/src/cfclient/ui/main.ui
@@ -189,7 +189,7 @@
       </item>
       <item>
        <widget class="QGroupBox" name="groupBox">
-        <layout class="QHBoxLayout" stretch="0,0,0,1">
+        <layout class="QHBoxLayout" stretch="0,0,1">
          <item>
           <widget class="QLabel" name="addressLabel">
            <property name="text">
@@ -220,19 +220,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QCheckBox" name="keepAliveCheckBox">
-           <property name="mouseTracking">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>Keep Alive</string>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
diff --git a/src/cfclient/ui/tabs/FlightTab.py b/src/cfclient/ui/tabs/FlightTab.py
index 22157f2091..f24947aa76 100644
--- a/src/cfclient/ui/tabs/FlightTab.py
+++ b/src/cfclient/ui/tabs/FlightTab.py
@@ -579,8 +579,7 @@ def _ring_populate_dropdown(self):
                            12: "Gravity",
                            13: "LED tab",
                            14: "Color fader",
-                           15: "Link quality",
-                           16: "Lighthouse quality"}
+                           15: "Link quality"}
 
         for i in range(nbr + 1):
             name = "{}: ".format(i)