diff --git a/multiplatform-lib/src/androidMain/kotlin/internal/KeyPairManagerImpl.android.kt b/multiplatform-lib/src/androidMain/kotlin/internal/KeyPairManagerImpl.android.kt
index 1a52fba8..0ad8ab5f 100644
--- a/multiplatform-lib/src/androidMain/kotlin/internal/KeyPairManagerImpl.android.kt
+++ b/multiplatform-lib/src/androidMain/kotlin/internal/KeyPairManagerImpl.android.kt
@@ -34,16 +34,9 @@ private class KeyPairManagerAndroidImpl : KeyPairManager() {
     private val keysDir by lazy {
         appCtx.filesDir.resolve("passkeys").also { passkeysDir ->
             passkeysDir.mkdir()
-            //TODO[ik-auth]: Remove the code below after the next pre-release.
-            appCtx.filesDir.listFiles { it.name.endsWith(".key") }!!.forEach { keyFile ->
-                keyFile.renameTo(passkeysDir.resolve(keyFile.name))
-            }
         }
     }
 
-    override fun ensureKeyPairsAreMoved() {
-        val _ = keysDir //TODO[ik-auth]: Remove this code and the super method after the next pre-release.
-    }
     @Throws(Exception::class)
     override suspend fun generateNewKey(userId: Long, keyId: String): Failure.KeyManagement.GenerationFailed? {
         val keyPair = generateEcKeyPair().getOrElse {
diff --git a/multiplatform-lib/src/commonMain/kotlin/AuthenticatorFacade.kt b/multiplatform-lib/src/commonMain/kotlin/AuthenticatorFacade.kt
index ca624a23..c52dcb1f 100644
--- a/multiplatform-lib/src/commonMain/kotlin/AuthenticatorFacade.kt
+++ b/multiplatform-lib/src/commonMain/kotlin/AuthenticatorFacade.kt
@@ -89,7 +89,7 @@ abstract class AuthenticatorFacade internal constructor() {
             val authenticatorManager = AuthenticatorManager(
                 webAuthnRepository = webAuthnRepository,
                 accountsRepository = accountsRepository
-            ).also { it.keyPairManager.ensureKeyPairsAreMoved() }
+            )
             val migrationManager = MigrationManager(
                 accountsDatabase = accountsDatabase,
                 authenticatorManager = authenticatorManager,
diff --git a/multiplatform-lib/src/commonMain/kotlin/internal/KeyManager.kt b/multiplatform-lib/src/commonMain/kotlin/internal/KeyManager.kt
index ca7cebe4..6ca729eb 100644
--- a/multiplatform-lib/src/commonMain/kotlin/internal/KeyManager.kt
+++ b/multiplatform-lib/src/commonMain/kotlin/internal/KeyManager.kt
@@ -30,8 +30,6 @@ internal abstract class KeyPairManager protected constructor() {
         operator fun invoke(): KeyPairManager = createKeyPairManager()
     }
 
-    open fun ensureKeyPairsAreMoved() = Unit
-
     /**
      * Generates key pair for a new registration
      * (migrating from kAuth v1 or a backup, or a fresh new login)