diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 30a429a31..f5e4e1aa4 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -18,7 +18,6 @@ object Versions {
         const val prefs = "1.2.0"
         const val datastore = "1.0.0"
         const val compose = "1.6.8"
-        const val composeCompiler = "1.5.8"
         const val navCompose = "2.6.0"
         const val accompanist = "0.30.1"
         const val composeConstraintLayout = "1.1.0-alpha09"
diff --git a/phoenix-android/build.gradle.kts b/phoenix-android/build.gradle.kts
index 9bc9ac415..6b01660a9 100644
--- a/phoenix-android/build.gradle.kts
+++ b/phoenix-android/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     kotlin("android")
     id("com.google.gms.google-services")
     id("kotlinx-serialization")
+    id("org.jetbrains.kotlin.plugin.compose") version Versions.kotlin
 }
 
 fun gitCommitHash(): String {
@@ -71,10 +72,6 @@ android {
         dataBinding = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = Versions.Android.composeCompiler
-    }
-
     packagingOptions {
         resources.merges.add("reference.conf")
     }
diff --git a/phoenix-shared/src/androidMain/kotlin/fr/acinq/phoenix/managers/AppConnectionsDaemon.kt b/phoenix-shared/src/androidMain/kotlin/fr/acinq/phoenix/managers/AppConnectionsDaemon.kt
deleted file mode 100644
index 7aa0a622d..000000000
--- a/phoenix-shared/src/androidMain/kotlin/fr/acinq/phoenix/managers/AppConnectionsDaemon.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package fr.acinq.phoenix.managers
-
-import fr.acinq.tor.Tor
-import kotlinx.coroutines.*
-
-@OptIn(ExperimentalStdlibApi::class)
-actual suspend fun Tor.startInProperScope(scope: CoroutineScope) {
-    val currentDispatcher = scope.coroutineContext[CoroutineDispatcher.Key]
-    if (currentDispatcher != Dispatchers.Default || currentDispatcher != Dispatchers.IO) {
-        // on Android, tor startup MUST be run in a background thread, because it is a network operation.
-        // see [android.os.NetworkOnMainThreadException]
-        this.start(CoroutineScope(scope.coroutineContext.job + Dispatchers.Default))
-    } else {
-        this.start(scope)
-    }
-}
\ No newline at end of file