diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultToDeviceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultToDeviceService.kt
index 5bdb969113..1615b8eef9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultToDeviceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultToDeviceService.kt
@@ -22,12 +22,11 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
 import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
-import org.matrix.android.sdk.internal.crypto.tasks.DefaultSendToDeviceTask
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import javax.inject.Inject
 
 internal class DefaultToDeviceService @Inject constructor(
-        private val sendToDeviceTask: DefaultSendToDeviceTask,
+        private val sendToDeviceTask: SendToDeviceTask,
         private val messageEncrypter: MessageEncrypter,
         private val cryptoStore: IMXCryptoStore
 ) : ToDeviceService {
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 cf6ff4a872..531dea1d5a 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
@@ -376,6 +376,12 @@ internal abstract class SessionModule {
     @Binds
     abstract fun bindOpenIdTokenService(service: DefaultOpenIdService): OpenIdService
 
+    @Binds
+    abstract fun bindToDeviceService(service: DefaultToDeviceService): ToDeviceService
+
+    @Binds
+    abstract fun bindEventStreamService(service: DefaultEventStreamService): EventStreamService
+
     @Binds
     abstract fun bindTypingUsersTracker(tracker: DefaultTypingUsersTracker): TypingUsersTracker
 
@@ -384,10 +390,4 @@ internal abstract class SessionModule {
 
     @Binds
     abstract fun bindEventSenderProcessor(processor: EventSenderProcessorCoroutine): EventSenderProcessor
-
-    @Binds
-    abstract fun bindToDeviceService(deviceService: DefaultToDeviceService): ToDeviceService
-
-    @Binds
-    abstract fun bindEventStreamService(deviceService: DefaultEventStreamService): EventStreamService
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/StreamEventsManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/StreamEventsManager.kt
index c39f5fded8..bb0ca11445 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/StreamEventsManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/StreamEventsManager.kt
@@ -35,17 +35,15 @@ internal class StreamEventsManager @Inject constructor() {
     private val listeners = mutableListOf<LiveEventListener>()
 
     fun addLiveEventListener(listener: LiveEventListener) {
-        Timber.v("## VALR: addLiveEventListener")
         listeners.add(listener)
     }
 
     fun removeLiveEventListener(listener: LiveEventListener) {
-        Timber.v("## VALR: removeLiveEventListener")
         listeners.remove(listener)
     }
 
     fun dispatchLiveEventReceived(event: Event, roomId: String, initialSync: Boolean) {
-        Timber.v("## VALR: dispatchLiveEventReceived ${event.eventId}")
+        Timber.v("## dispatchLiveEventReceived ${event.eventId}")
         coroutineScope.launch {
             if (!initialSync) {
                 listeners.forEach {
@@ -58,7 +56,7 @@ internal class StreamEventsManager @Inject constructor() {
     }
 
     fun dispatchPaginatedEventReceived(event: Event, roomId: String) {
-        Timber.v("## VALR: dispatchPaginatedEventReceived ${event.eventId}")
+        Timber.v("## dispatchPaginatedEventReceived ${event.eventId}")
         coroutineScope.launch {
             listeners.forEach {
                 tryOrNull {
@@ -69,7 +67,7 @@ internal class StreamEventsManager @Inject constructor() {
     }
 
     fun dispatchLiveEventDecrypted(event: Event, result: MXEventDecryptionResult) {
-        Timber.v("## VALR: dispatchLiveEventDecrypted ${event.eventId}")
+        Timber.v("## dispatchLiveEventDecrypted ${event.eventId}")
         coroutineScope.launch {
             listeners.forEach {
                 tryOrNull {
@@ -80,7 +78,7 @@ internal class StreamEventsManager @Inject constructor() {
     }
 
     fun dispatchLiveEventDecryptionFailed(event: Event, error: Throwable) {
-        Timber.v("## VALR: dispatchLiveEventDecryptionFailed ${event.eventId}")
+        Timber.v("## dispatchLiveEventDecryptionFailed ${event.eventId}")
         coroutineScope.launch {
             listeners.forEach {
                 tryOrNull {
@@ -91,7 +89,7 @@ internal class StreamEventsManager @Inject constructor() {
     }
 
     fun dispatchOnLiveToDevice(event: Event) {
-        Timber.v("## VALR: dispatchOnLiveToDevice ${event.eventId}")
+        Timber.v("## dispatchOnLiveToDevice ${event.eventId}")
         coroutineScope.launch {
             listeners.forEach {
                 tryOrNull {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index 62e3896ac5..a85f0dbdc9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.database.helper.addIfNecessary
 import org.matrix.android.sdk.internal.database.helper.addStateEvent
 import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
 import org.matrix.android.sdk.internal.database.mapper.toEntity
@@ -36,6 +37,7 @@ import org.matrix.android.sdk.internal.database.query.find
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.StreamEventsManager
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/AutoRageShaker.kt b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
index 38840b8df8..7479b0421c 100644
--- a/vector/src/main/java/im/vector/app/AutoRageShaker.kt
+++ b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
@@ -170,7 +170,6 @@ class AutoRageShaker @Inject constructor(
                     }
 
                     override fun onUploadSucceed(reportUrl: String?) {
-                        Timber.w("## VALR Report URL is $reportUrl")
                         // we need to send the toDevice message to the sender
 
                         coroutineScope.launch {
@@ -190,7 +189,7 @@ class AutoRageShaker @Inject constructor(
                                         ).toContent()
                                 )
                             } catch (failure: Throwable) {
-                                Timber.w("## VALR : failed to send auto-uisi to device")
+                                Timber.w("failed to send auto-uisi to device")
                             }
                         }
                     }