diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/Event.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/Event.kt
index 9f897a5351..642b24f067 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/Event.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/Event.kt
@@ -1,9 +1,7 @@
 package im.vector.matrix.android.api.events
 
-import com.google.gson.JsonObject
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import im.vector.matrix.android.internal.legacy.util.JsonUtils
 
 @JsonClass(generateAdapter = true)
 data class Event(
@@ -16,14 +14,6 @@ data class Event(
         @Json(name = "state_key") val stateKey: String? = null,
         @Json(name = "room_id") val roomId: String? = null,
         @Json(name = "unsigned_data") val unsignedData: UnsignedData? = null
-){
-
-    fun contentAsJsonObject(): JsonObject? {
-        return JsonUtils.toJson(content)
-    }
-
-
-
-}
+)
 
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt
index b9fe0410b5..8b61de0a56 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt
@@ -2,7 +2,6 @@ package im.vector.matrix.android.internal.auth
 
 import android.content.Context
 import im.vector.matrix.android.api.auth.Authenticator
-import im.vector.matrix.android.api.auth.SessionParamsStore
 import im.vector.matrix.android.internal.auth.db.ObjectBoxSessionParams
 import im.vector.matrix.android.internal.auth.db.ObjectBoxSessionParamsMapper
 import im.vector.matrix.android.internal.auth.db.ObjectBoxSessionParamsStore
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt
index 118170b4c6..751fd40ff1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt
@@ -4,7 +4,6 @@ import arrow.core.leftIfNull
 import com.squareup.moshi.Moshi
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.auth.Authenticator
-import im.vector.matrix.android.api.auth.SessionParamsStore
 import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
 import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.api.session.Session
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/SessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt
similarity index 78%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/SessionParamsStore.kt
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt
index 908a69c955..0108dea57f 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/SessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt
@@ -1,4 +1,4 @@
-package im.vector.matrix.android.api.auth
+package im.vector.matrix.android.internal.auth
 
 import im.vector.matrix.android.internal.auth.data.SessionParams
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/ObjectBoxSessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/ObjectBoxSessionParamsStore.kt
index 19b31c062b..5083766b87 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/ObjectBoxSessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/ObjectBoxSessionParamsStore.kt
@@ -1,6 +1,6 @@
 package im.vector.matrix.android.internal.auth.db
 
-import im.vector.matrix.android.api.auth.SessionParamsStore
+import im.vector.matrix.android.internal.auth.SessionParamsStore
 import im.vector.matrix.android.internal.auth.data.SessionParams
 import io.objectbox.Box
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt
index 2274a4fcee..0dbf2cc569 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt
@@ -1,6 +1,6 @@
 package im.vector.matrix.android.internal.network
 
-import im.vector.matrix.android.api.auth.SessionParamsStore
+import im.vector.matrix.android.internal.auth.SessionParamsStore
 import okhttp3.Interceptor
 import okhttp3.Response