diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerService.kt
index 213ebed0e6..45427b73f8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/contentscanner/ContentScannerService.kt
@@ -24,11 +24,12 @@ interface ContentScannerService {
 
     val serverPublicKey: String?
 
-    //TODO: suspend
+    // TODO: suspend
     fun getContentScannerServer(): String?
     suspend fun setScannerUrl(url: String?)
     suspend fun enableScanner(enabled: Boolean)
-    //TODO: suspend
+
+    // TODO: suspend
     fun isScannerEnabled(): Boolean
     fun getLiveStatusForFile(mxcUrl: String, fetchIfNeeded: Boolean = true, fileInfo: ElementToDecrypt? = null): Flow<Optional<ScanStatusInfo>>
     suspend fun getCachedScanResultForFile(mxcUrl: String): ScanStatusInfo?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo004.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo004.kt
index a958478605..c87d3ca492 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo004.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo004.kt
@@ -49,7 +49,6 @@ internal class MigrateAuthTo004(migrationContext: AutomaticSchemaMigration.Migra
                         homeserverConnectionConfig
                     }
             newObj?.set("homeServerConnectionConfigJson", adapter.toJson(alteredHomeserverConnectionConfig))
-
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo005.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo005.kt
index 1d3f6e91f1..0e361d2e4b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo005.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo005.kt
@@ -29,5 +29,4 @@ internal class MigrateAuthTo005(migrationContext: AutomaticSchemaMigration.Migra
             newObj?.set("loginType", LoginType.UNKNOWN.name)
         }
     }
-
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
index 09ce2e1186..ae501732b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
@@ -21,7 +21,6 @@ import dagger.Module
 import dagger.Provides
 import io.realm.kotlin.RealmConfiguration
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
@@ -60,8 +59,8 @@ import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.StoreSessionsData
 import org.matrix.android.sdk.internal.crypto.keysbackup.tasks.UpdateKeysBackupVersionTask
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.store.db.CRYPTO_REALM_SCHEMA
-import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreMigration
 import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore
+import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreMigration
 import org.matrix.android.sdk.internal.crypto.tasks.ClaimOneTimeKeysForUsersDeviceTask
 import org.matrix.android.sdk.internal.crypto.tasks.DefaultClaimOneTimeKeysForUsersDevice
 import org.matrix.android.sdk.internal.crypto.tasks.DefaultDeleteDeviceTask
@@ -93,7 +92,6 @@ import org.matrix.android.sdk.internal.crypto.tasks.UploadSigningKeysTask
 import org.matrix.android.sdk.internal.database.RealmInstance
 import org.matrix.android.sdk.internal.database.RealmKeysUtils
 import org.matrix.android.sdk.internal.di.CryptoDatabase
-import org.matrix.android.sdk.internal.di.IdentityDatabase
 import org.matrix.android.sdk.internal.di.SessionCoroutineScope
 import org.matrix.android.sdk.internal.di.SessionFilesDirectory
 import org.matrix.android.sdk.internal.di.UserMd5
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 74edf3228d..cf6e8e6b70 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -22,9 +22,7 @@ import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
 import com.squareup.moshi.Types
 import dagger.Lazy
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt
index 31eaefd66a..43cd23d33d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingKeyRequestManager.kt
@@ -17,9 +17,7 @@
 package org.matrix.android.sdk.internal.crypto
 
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingKeyRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingKeyRequestManager.kt
index 5ce4cfaee7..a55d7c0c8c 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingKeyRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingKeyRequestManager.kt
@@ -17,9 +17,7 @@
 package org.matrix.android.sdk.internal.crypto
 
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index 02e2eac40a..9cd771d3c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -58,7 +58,6 @@ import org.matrix.olm.OlmPkSigning
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
-import kotlin.time.Duration.Companion.seconds
 
 @SessionScope
 internal class DefaultCrossSigningService @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
index e5ec6fddeb..34992db8f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
@@ -197,7 +197,6 @@ internal class UpdateTrustWorker(context: Context, params: WorkerParameters, ses
                     }
                 }
             }
-
         }
         // So Cross Signing keys trust is updated, device trust is updated
         // We can now update room shields? in the session DB?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 91b5171fe7..4c7638a5f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -25,7 +25,6 @@ import io.realm.kotlin.UpdatePolicy
 import io.realm.kotlin.query.RealmQuery
 import io.realm.kotlin.query.RealmSingleQuery
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.logger.LoggerTag
@@ -418,7 +417,6 @@ internal class RealmCryptoStore @Inject constructor(
                 }
                 userEntity.crossSigningInfoEntity = signingInfo
             }
-
         }
     }
 
@@ -873,7 +871,6 @@ internal class RealmCryptoStore @Inject constructor(
                 // Only one object
                 copyToRealm(keysBackupData, updatePolicy = UpdatePolicy.ALL)
             }
-
         }
     }
 
@@ -884,7 +881,6 @@ internal class RealmCryptoStore @Inject constructor(
                     .forEach { inboundGroupSession ->
                         inboundGroupSession.backedUp = false
                     }
-
         }
     }
 
@@ -1272,7 +1268,6 @@ internal class RealmCryptoStore @Inject constructor(
                         // I delete like this because I want to cascade delete replies?
                         deleteOnCascade(it)
                     }
-
         }
     }
 
@@ -1621,7 +1616,6 @@ internal class RealmCryptoStore @Inject constructor(
                 operation(newWithHeldSessionEntity)
                 copyToRealm(newWithHeldSessionEntity)
             }
-
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo002Legacy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo002Legacy.kt
index f97773e696..1ac050a0bd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo002Legacy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo002Legacy.kt
@@ -22,7 +22,6 @@ import timber.log.Timber
 
 internal class MigrateCryptoTo002Legacy(context: AutomaticSchemaMigration.MigrationContext) : KotlinRealmMigrator(context, 2) {
 
-
     override fun doMigrate(migrationContext: AutomaticSchemaMigration.MigrationContext) {
         Timber.d("Update IncomingRoomKeyRequestEntity format: requestBodyString field is exploded into several fields")
         Timber.d("Update OutgoingRoomKeyRequestEntity format: requestBodyString field is exploded into several fields")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
index 93dc9c00d7..6db7c484d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
@@ -96,7 +96,6 @@ internal class MigrateCryptoTo004(context: AutomaticSchemaMigration.MigrationCon
                 // an unfortunate refactor did modify that class, making deserialization failing
                 // so we just skip and ignore..
             }
-
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo010.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo010.kt
index a76392cf07..49c2de5bf9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo010.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo010.kt
@@ -27,5 +27,4 @@ internal class MigrateCryptoTo010(context: AutomaticSchemaMigration.MigrationCon
         Timber.d("Create WithHeldSessionEntity")
         Timber.d("Create SharedSessionEntity")
     }
-
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo011.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo011.kt
index d1a4afb1a9..296d8df885 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo011.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo011.kt
@@ -26,5 +26,4 @@ internal class MigrateCryptoTo011(context: AutomaticSchemaMigration.MigrationCon
     override fun doMigrate(migrationContext: AutomaticSchemaMigration.MigrationContext) {
         Timber.d("Update CryptoMetadataEntity")
     }
-
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo014.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo014.kt
index 2dfb48d3cb..83dfa87a76 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo014.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo014.kt
@@ -27,7 +27,7 @@ internal class MigrateCryptoTo014(context: AutomaticSchemaMigration.MigrationCon
     override fun doMigrate(migrationContext: AutomaticSchemaMigration.MigrationContext) {
         Timber.d("Update SharedSessionEntity")
         migrationContext.safeEnumerate("SharedSessionEntity") { oldObject, newObject ->
-            if(newObject == null) return@safeEnumerate
+            if (newObject == null) return@safeEnumerate
             val sharedUserId = oldObject.getNullableValue("userId", String::class)
             val sharedDeviceId = oldObject.getNullableValue("deviceId", String::class)
             val knownDevice = migrationContext.newRealm.query("DeviceInfoEntity")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo015.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo015.kt
index 29be3f62a5..dd69afc0ca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo015.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo015.kt
@@ -28,7 +28,7 @@ internal class MigrateCryptoTo015(context: AutomaticSchemaMigration.MigrationCon
     override fun doMigrate(migrationContext: AutomaticSchemaMigration.MigrationContext) {
         Timber.d("Update CryptoRoomEntity")
         migrationContext.safeEnumerate("CryptoRoomEntity") { oldObject, newObject ->
-            if(newObject == null) return@safeEnumerate
+            if (newObject == null) return@safeEnumerate
             val currentAlgorithm = oldObject.getNullableValue("algorithm", String::class)
             newObject.set("wasEncryptedOnce", currentAlgorithm == MXCRYPTO_ALGORITHM_MEGOLM)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
index e10fab3ce2..b7d819f9b7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
@@ -17,7 +17,6 @@ package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
-import io.realm.kotlin.deleteFromRealm
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.UnsignedDeviceInfo
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt
index aefa1e30af..f55ec97427 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingKeyRequestEntity.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.crypto.store.db.model
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Types
-import io.realm.kotlin.deleteFromRealm
 import io.realm.kotlin.ext.realmListOf
 import io.realm.kotlin.types.RealmList
 import io.realm.kotlin.types.RealmObject
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/KotlinRealmMigrator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/KotlinRealmMigrator.kt
index f5843d0a19..32ca78db83 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/KotlinRealmMigrator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/KotlinRealmMigrator.kt
@@ -40,4 +40,3 @@ val AutomaticSchemaMigration.MigrationContext.newVersion: Long
     get() {
         return newRealm.schemaVersion()
     }
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmExt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmExt.kt
index 7b60d50b4a..57bc1b87b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmExt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmExt.kt
@@ -102,4 +102,3 @@ internal fun AutomaticSchemaMigration.MigrationContext.safeEnumerate(
         block(it, latest)
     }
 }
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstance.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstance.kt
index 08d0235626..1ee6b91de9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstance.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstance.kt
@@ -143,6 +143,3 @@ internal class RealmInstance(
         }
     }
 }
-
-
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
index 1b4796c447..04fc750f9d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
@@ -100,7 +100,6 @@ internal class RealmKeysUtils @Inject constructor(
         realmConfigurationBuilder.encryptionKey(key)
     }
 
-
     // Expose to handle Realm migration to riotX
     fun getRealmEncryptionKey(alias: String): ByteArray {
         val key = if (hasKeyForDatabase(alias)) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
index 378fe499d1..5b4303f5bf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
@@ -21,7 +21,6 @@ import io.realm.Realm
 import io.realm.RealmChangeListener
 import io.realm.RealmConfiguration
 import io.realm.RealmModel
-import io.realm.RealmObject
 import io.realm.RealmResults
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
index ca3697885e..fca19ce4eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.database.helper
 
 import io.realm.Realm
-import io.realm.RealmObject
 import io.realm.kotlin.createObject
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.toModel
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
index b90b8c2028..24ecfcd6d2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.database.helper
 
 import com.squareup.moshi.JsonDataException
 import io.realm.Realm
-import io.realm.RealmModel
 import io.realm.RealmQuery
 import io.realm.Sort
 import org.matrix.android.sdk.api.session.events.model.UnsignedData
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/debug/DefaultDebugService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/debug/DefaultDebugService.kt
index ef68c7621c..e9a295a2a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/debug/DefaultDebugService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/debug/DefaultDebugService.kt
@@ -19,26 +19,23 @@ package org.matrix.android.sdk.internal.debug
 import io.realm.RealmConfiguration
 import org.matrix.android.sdk.api.debug.DebugService
 import org.matrix.android.sdk.internal.SessionManager
-import org.matrix.android.sdk.internal.database.tools.RealmDebugTools
-import org.matrix.android.sdk.internal.di.AuthDatabase
-import org.matrix.android.sdk.internal.di.GlobalDatabase
 import javax.inject.Inject
 
 internal class DefaultDebugService @Inject constructor(
-        //@AuthDatabase private val realmConfigurationAuth: RealmConfiguration,
-        //@GlobalDatabase private val realmConfigurationGlobal: RealmConfiguration,
+        // @AuthDatabase private val realmConfigurationAuth: RealmConfiguration,
+        // @GlobalDatabase private val realmConfigurationGlobal: RealmConfiguration,
         private val sessionManager: SessionManager,
 ) : DebugService {
 
     override fun getAllRealmConfigurations(): List<RealmConfiguration> {
         return sessionManager.getLastSession()?.getRealmConfigurations().orEmpty()
-                //realmConfigurationAuth +
-                //realmConfigurationGlobal
+                // realmConfigurationAuth +
+                // realmConfigurationGlobal
     }
 
     override fun logDbUsageInfo() {
-        //RealmDebugTools(realmConfigurationAuth).logInfo("Auth")
-        //RealmDebugTools(realmConfigurationGlobal).logInfo("Global")
+        // RealmDebugTools(realmConfigurationAuth).logInfo("Auth")
+        // RealmDebugTools(realmConfigurationGlobal).logInfo("Global")
         sessionManager.getLastSession()?.logDbUsageInfo()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
index 1ec238be52..4b7d7b580e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
@@ -17,8 +17,6 @@
 package org.matrix.android.sdk.internal.legacy
 
 import android.content.Context
-import io.realm.Realm
-import io.realm.RealmConfiguration
 import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.auth.LoginType
 import org.matrix.android.sdk.api.auth.data.Credentials
@@ -164,7 +162,7 @@ internal class DefaultLegacySessionImporter @Inject constructor(
         newLocation.mkdirs()
 
         Timber.d("Migration: create legacy realm configuration")
-        //TODO: RE-ENABLE before merging...
+        // TODO: RE-ENABLE before merging...
         /*
         val userMd5 = legacyConfig.credentials.userId.md5()
         val keyAlias = "crypto_module_$userMd5"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
index bd330fbcb4..d499d27613 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.query
 
 import io.realm.RealmModel
-import io.realm.RealmObject
 import io.realm.RealmQuery
 
 internal fun <T : RealmModel, E : Enum<E>> RealmQuery<T>.process(field: String, enums: List<Enum<E>>): RealmQuery<T> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/CleanRawCacheTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/CleanRawCacheTask.kt
index 22dbc91616..bc31de2b6e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/CleanRawCacheTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/CleanRawCacheTask.kt
@@ -17,8 +17,8 @@
 package org.matrix.android.sdk.internal.raw
 
 import org.matrix.android.sdk.internal.database.RealmInstance
-import org.matrix.android.sdk.internal.raw.db.model.RawCacheEntity
 import org.matrix.android.sdk.internal.di.GlobalDatabase
+import org.matrix.android.sdk.internal.raw.db.model.RawCacheEntity
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/db/migration/GlobalRealmMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/db/migration/GlobalRealmMigration.kt
index e0f05720b0..159f25b028 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/db/migration/GlobalRealmMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/db/migration/GlobalRealmMigration.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.raw.db.migration
 
 import io.realm.kotlin.migration.AutomaticSchemaMigration
 import org.matrix.android.sdk.internal.database.MatrixAutomaticSchemaMigration
-import org.matrix.android.sdk.internal.raw.db.migration.MigrateGlobalTo001
 import javax.inject.Inject
 
 internal class GlobalRealmMigration @Inject constructor() : MatrixAutomaticSchemaMigration(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/db/model/KnownServerUrlEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/db/model/KnownServerUrlEntity.kt
index 3f18671f4a..0c1b5c7a4e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/db/model/KnownServerUrlEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/db/model/KnownServerUrlEntity.kt
@@ -19,8 +19,7 @@ package org.matrix.android.sdk.internal.raw.db.model
 import io.realm.kotlin.types.RealmObject
 import io.realm.kotlin.types.annotations.PrimaryKey
 
-internal class KnownServerUrlEntity(
-) : RealmObject {
+internal class KnownServerUrlEntity() : RealmObject {
 
     @PrimaryKey
     var url: String = ""
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 4087e51ad2..fbae741e73 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -69,9 +69,6 @@ import org.matrix.android.sdk.internal.auth.SSO_UIA_FALLBACK_PATH
 import org.matrix.android.sdk.internal.auth.SessionParamsStore
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.database.tools.RealmDebugTools
-import org.matrix.android.sdk.internal.di.ContentScannerDatabase
-import org.matrix.android.sdk.internal.di.CryptoDatabase
-import org.matrix.android.sdk.internal.di.IdentityDatabase
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
@@ -262,17 +259,17 @@ internal class DefaultSession @Inject constructor(
 
     override fun logDbUsageInfo() {
         RealmDebugTools(realmConfiguration).logInfo("Session")
-        //RealmDebugTools(realmConfigurationCrypto).logInfo("Crypto")
-        //RealmDebugTools(realmConfigurationIdentity).logInfo("Identity")
-        //RealmDebugTools(realmConfigurationContentScanner).logInfo("ContentScanner")
+        // RealmDebugTools(realmConfigurationCrypto).logInfo("Crypto")
+        // RealmDebugTools(realmConfigurationIdentity).logInfo("Identity")
+        // RealmDebugTools(realmConfigurationContentScanner).logInfo("ContentScanner")
     }
 
     override fun getRealmConfigurations(): List<RealmConfiguration> {
         return listOf(
                 realmConfiguration,
-                //realmConfigurationCrypto,
-                //realmConfigurationIdentity,
-                //realmConfigurationContentScanner,
+                // realmConfigurationCrypto,
+                // realmConfigurationIdentity,
+                // realmConfigurationContentScanner,
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index db1dd41523..8bc0856215 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -312,7 +312,6 @@ internal abstract class SessionModule {
         fun providesSessionCoroutineScope(coroutineScopeHolder: SessionCoroutineScopeHolder): CoroutineScope {
             return coroutineScopeHolder.scope
         }
-
     }
 
     @Binds
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DisabledContentScannerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DisabledContentScannerService.kt
index 1f8cbbafde..d2152f7f16 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DisabledContentScannerService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DisabledContentScannerService.kt
@@ -16,8 +16,6 @@
 
 package org.matrix.android.sdk.internal.session.contentscanner
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import org.matrix.android.sdk.api.session.contentscanner.ContentScannerService
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerInfoEntity.kt
index b411fda0bf..39d4a34694 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerInfoEntity.kt
@@ -24,4 +24,3 @@ internal open class ContentScannerInfoEntity : RealmObject {
 
     companion object
 }
-
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
index 7f0831093d..7d61bf3fe7 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
@@ -65,7 +65,6 @@ class ContactsBookViewModel @AssistedInject constructor(
 
     private fun loadContacts() {
         viewModelScope.launch(Dispatchers.IO) {
-
             val identityServerUrl = session.identityService().getCurrentIdentityServerUrl()
             val userConsent = session.identityService().getUserConsent()
 
@@ -162,7 +161,6 @@ class ContactsBookViewModel @AssistedInject constructor(
     }
 
     override fun handle(action: ContactsBookAction) {
-
         when (action) {
             is ContactsBookAction.FilterWith -> handleFilterWith(action)
             is ContactsBookAction.OnlyBoundContacts -> handleOnlyBoundContacts(action)