diff --git a/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt b/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
index 6f2312bf8..ab7bdf2b4 100644
--- a/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
@@ -8,7 +8,6 @@ import android.content.pm.PackageManager
 import android.hardware.usb.UsbManager
 import android.os.Build
 import androidx.core.content.ContextCompat
-import com.geeksville.mesh.service.BluetoothInterface
 
 /**
  * @return null on platforms without a BlueTooth driver (i.e. the emulator)
@@ -19,6 +18,14 @@ val Context.usbManager: UsbManager get() = requireNotNull(getSystemService(Conte
 
 val Context.notificationManager: NotificationManager get() = requireNotNull(getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager?)
 
+/**
+ * @return true if CompanionDeviceManager API is present
+ */
+fun Context.hasCompanionDeviceApi(): Boolean =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+        packageManager.hasSystemFeature(PackageManager.FEATURE_COMPANION_DEVICE_SETUP)
+    else false
+
 /**
  * return a list of the permissions we don't have
  */
@@ -62,7 +69,7 @@ fun Context.getScanPermissions(): List<String> {
         perms.add(Manifest.permission.BLUETOOTH_ADMIN)
     }
 */
-    if (!BluetoothInterface.hasCompanionDeviceApi(this)) {
+    if (!hasCompanionDeviceApi()) {
         perms.add(Manifest.permission.ACCESS_FINE_LOCATION)
         perms.add(Manifest.permission.BLUETOOTH_ADMIN)
     }
diff --git a/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt b/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt
index 5fdd12b3f..cb2b42011 100644
--- a/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt
@@ -5,10 +5,7 @@ import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothGattCharacteristic
 import android.bluetooth.BluetoothGattService
 import android.bluetooth.BluetoothManager
-import android.companion.CompanionDeviceManager
 import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
 import com.geeksville.android.Logging
 import com.geeksville.concurrent.handledLaunch
 import com.geeksville.util.anonymize
@@ -112,12 +109,6 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String
         /** Return true if this address is still acceptable. For BLE that means, still bonded */
         @SuppressLint("NewApi", "MissingPermission")
         override fun addressValid(context: Context, rest: String): Boolean {
-            /* val allPaired = if (hasCompanionDeviceApi(context)) {
-                val deviceManager: CompanionDeviceManager by lazy {
-                    context.getSystemService(Context.COMPANION_DEVICE_SERVICE) as CompanionDeviceManager
-                }
-                deviceManager.associations.map { it }.toSet()
-            } else { */
             val allPaired = getBluetoothAdapter(context)?.bondedDevices.orEmpty()
                     .map { it.address }.toSet()
             return if (!allPaired.contains(rest)) {
@@ -127,63 +118,6 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String
                 true
         }
 
-
-        /// Return the device we are configured to use, or null for none
-        /*
-        @SuppressLint("NewApi")
-        fun getBondedDeviceAddress(context: Context): String? =
-            if (hasCompanionDeviceApi(context)) {
-                // Use new companion API
-
-                val deviceManager = context.getSystemService(CompanionDeviceManager::class.java)
-                val associations = deviceManager.associations
-                val result = associations.firstOrNull()
-                debug("reading bonded devices: $result")
-                result
-            } else {
-                // Use classic API and a preferences string
-
-                val allPaired =
-                    getBluetoothAdapter(context)?.bondedDevices.orEmpty().map { it.address }.toSet()
-
-                // If the user has unpaired our device, treat things as if we don't have one
-                val address = InterfaceService.getPrefs(context).getString(DEVADDR_KEY, null)
-
-                if (address != null && !allPaired.contains(address)) {
-                    warn("Ignoring stale bond to ${address.anonymize}")
-                    null
-                } else
-                    address
-            }
-*/
-
-        /// Can we use the modern BLE scan API?
-        fun hasCompanionDeviceApi(context: Context): Boolean =
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                val res =
-                    context.packageManager.hasSystemFeature(PackageManager.FEATURE_COMPANION_DEVICE_SETUP)
-                debug("CompanionDevice API available=$res")
-                res
-            } else {
-                warn("CompanionDevice API not available, falling back to classic scan")
-                false
-            }
-
-        /** FIXME - when adding companion device support back in, use this code to set companion device from setBondedDevice
-         *         if (BluetoothInterface.hasCompanionDeviceApi(this)) {
-        // We only keep an association to one device at a time...
-        if (addr != null) {
-        val deviceManager = getSystemService(CompanionDeviceManager::class.java)
-
-        deviceManager.associations.forEach { old ->
-        if (addr != old) {
-        BluetoothInterface.debug("Forgetting old BLE association $old")
-        deviceManager.disassociate(old)
-        }
-        }
-        }
-         */
-
         /**
          * this is created in onCreate()
          * We do an ugly hack of keeping it in the singleton so we can share it for the rare software update case
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index b0a2f55fb..4cc634b61 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -145,6 +145,7 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
     }
 
     val bluetoothAdapter = context.bluetoothManager?.adapter
+    val hasCompanionDeviceApi get() = context.hasCompanionDeviceApi()
     private val usbManager get() = context.usbManager
 
     var selectedAddress: String? = null
@@ -457,10 +458,6 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
     private val guiJob = Job()
     private val mainScope = CoroutineScope(Dispatchers.Main + guiJob)
 
-    private val hasCompanionDeviceApi: Boolean by lazy {
-        BluetoothInterface.hasCompanionDeviceApi(requireContext())
-    }
-
     private val deviceManager: CompanionDeviceManager by lazy {
         requireContext().getSystemService(Context.COMPANION_DEVICE_SERVICE) as CompanionDeviceManager
     }
@@ -949,7 +946,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
         super.onViewCreated(view, savedInstanceState)
 
         initCommonUI()
-        if (hasCompanionDeviceApi)
+        if (scanModel.hasCompanionDeviceApi)
             initModernScan()
         else
             initClassicScan()