diff --git a/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt b/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt
index fe71c38f..9c0d0a9b 100644
--- a/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt
+++ b/app/src/main/kotlin/com/looker/droidify/service/DownloadService.kt
@@ -188,6 +188,12 @@ class DownloadService : ConnectionService<DownloadService.Binder>() {
         }
     }
 
+    override fun onTimeout(startId: Int) {
+        super.onTimeout(startId)
+        onDestroy()
+        stopSelf()
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         cancelTasks(null)
diff --git a/app/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/app/src/main/kotlin/com/looker/droidify/service/SyncService.kt
index c1710d81..1f6201ce 100644
--- a/app/src/main/kotlin/com/looker/droidify/service/SyncService.kt
+++ b/app/src/main/kotlin/com/looker/droidify/service/SyncService.kt
@@ -216,6 +216,12 @@ class SyncService : ConnectionService<SyncService.Binder>() {
         }
     }
 
+    override fun onTimeout(startId: Int) {
+        super.onTimeout(startId)
+        onDestroy()
+        stopSelf()
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         downloadConnection.unbind(this)
diff --git a/build-logic/structure/src/main/kotlin/DefaultConfig.kt b/build-logic/structure/src/main/kotlin/DefaultConfig.kt
index 23c6c913..67a72306 100644
--- a/build-logic/structure/src/main/kotlin/DefaultConfig.kt
+++ b/build-logic/structure/src/main/kotlin/DefaultConfig.kt
@@ -1,8 +1,8 @@
 object DefaultConfig {
     // Update [release_build.yml] along with this
-    const val buildTools: String = "34.0.0"
+    const val buildTools: String = "35.0.0"
     const val appId = "com.looker.droidify"
-    const val compileSdk = 34
+    const val compileSdk = 35
     const val minSdk = 23
     // Check for TODOs before update
     const val versionCode = 630
diff --git a/sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt b/sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt
index 2a5632d8..d78927c6 100644
--- a/sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt
+++ b/sync/fdroid/src/main/kotlin/com/looker/sync/fdroid/v2/EntrySyncable.kt
@@ -16,8 +16,6 @@ import com.looker.sync.fdroid.v2.model.Entry
 import com.looker.sync.fdroid.v2.model.IndexV2
 import com.looker.sync.fdroid.v2.model.IndexV2Diff
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json