diff --git a/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt b/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt
index d3fb0d6..ff08b79 100644
--- a/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt
+++ b/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt
@@ -40,7 +40,6 @@ class HealthConnectManager(private val context: Context) {
 
     val isEnabled: Flow<Boolean> = _isEnabled.asStateFlow()
     val hasPermissions: Flow<Boolean> = _hasPermissions.asStateFlow()
-    val autoSyncEnabled: Flow<Boolean> = _autoSync.asStateFlow()
     val isCompatible: Flow<Boolean> = _isCompatible.asStateFlow()
 
     companion object {
@@ -112,12 +111,6 @@ class HealthConnectManager(private val context: Context) {
         _hasPermissions.value = granted
     }
 
-    /** Enable or disable auto-sync */
-    fun setAutoSyncEnabled(enabled: Boolean) {
-        preferences.edit().putBoolean("auto_sync", enabled).apply()
-        _autoSync.value = enabled
-    }
-
     /** Check if all required permissions are granted */
     suspend fun hasAllPermissions(): Boolean {
         return try {
@@ -163,7 +156,7 @@ class HealthConnectManager(private val context: Context) {
     /** Get required permissions as strings */
     fun getRequiredPermissions(): Set<String> {
         return try {
-            REQUIRED_PERMISSIONS.map { it.toString() }.toSet()
+            REQUIRED_PERMISSIONS.map { it }.toSet()
         } catch (e: Exception) {
             Log.e(TAG, "Error getting required permissions", e)
             emptySet()
@@ -359,8 +352,4 @@ class HealthConnectManager(private val context: Context) {
         return _isEnabled.value && _hasPermissions.value
     }
 
-    /** Get last successful sync timestamp */
-    fun getLastSyncSuccess(): String? {
-        return preferences.getString("last_sync_success", null)
-    }
 }
diff --git a/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt b/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt
index d016f8d..4b0e207 100644
--- a/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt
+++ b/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt
@@ -33,7 +33,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
diff --git a/android/app/src/main/java/com/atridad/ascently/ui/screens/AddEditScreens.kt b/android/app/src/main/java/com/atridad/ascently/ui/screens/AddEditScreens.kt
index 622a845..8ee6f88 100644
--- a/android/app/src/main/java/com/atridad/ascently/ui/screens/AddEditScreens.kt
+++ b/android/app/src/main/java/com/atridad/ascently/ui/screens/AddEditScreens.kt
@@ -88,7 +88,7 @@ fun AddEditGymScreen(gymId: String?, viewModel: ClimbViewModel, onNavigateBack:
                                                         notes = notes
                                                 )
 
-                                        if (isEditing && gymId != null) {
+                                        if (isEditing) {
                                             viewModel.updateGym(gym.copy(id = gymId))
                                         } else {
                                             viewModel.addGym(gym)
@@ -386,7 +386,7 @@ fun AddEditProblemScreen(
                                                     )
 
                                             if (isEditing) {
-                                                problemId?.let { id ->
+                                                problemId.let { id ->
                                                     viewModel.updateProblem(problem.copy(id = id))
                                                 }
                                             } else {
@@ -762,7 +762,7 @@ fun AddEditSessionScreen(
                                                                             null
                                                                         }
                                                         )
-                                                sessionId?.let { id ->
+                                                sessionId.let { id ->
                                                     viewModel.updateSession(session.copy(id = id))
                                                 }
                                             } else {
diff --git a/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt b/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt
index 8c34209..ea18c13 100644
--- a/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt
+++ b/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt
@@ -114,7 +114,7 @@ class ClimbViewModel(
         }
     }
 
-    private suspend fun renameTemporaryImages(problem: Problem): Problem {
+    private fun renameTemporaryImages(problem: Problem): Problem {
         if (problem.imagePaths.isEmpty()) {
             return problem
         }