diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
index fc3d09d91d..d79d42bd3f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@@ -16,8 +16,6 @@
 
 package org.matrix.android.sdk.api.session.homeserver
 
-import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities.Companion.MAX_UPLOAD_FILE_SIZE_UNKNOWN
-
 data class HomeServerCapabilities(
         /**
          * True if it is possible to change the password of the account.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 7ad6d06b1e..7cbcfee713 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -354,7 +354,7 @@ internal class RoomSummaryUpdater @Inject constructor(
                             // we keep real m.child/m.parent relations and add the one for common memberships
                             dmRoom.flattenParentIds += "|${flattenRelated.joinToString("|")}|"
                         }
-                        Timber.v("## SPACES: flatten of ${dmRoom.otherMemberIds.joinToString(",")} is ${dmRoom.flattenParentIds}")
+//                        Timber.v("## SPACES: flatten of ${dmRoom.otherMemberIds.joinToString(",")} is ${dmRoom.flattenParentIds}")
                     }
 
             // Maybe a good place to count the number of notifications for spaces?
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 08e1d215c2..9a9836efab 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -834,13 +834,6 @@ class RoomDetailViewModel @AssistedInject constructor(
                                             room.roomSummary()?.isPublic ?: false
                                     )
                             )
-//                            session.coroutineScope.launch {
-//                                try {
-//                                    room.upgradeToVersion(slashCommandResult.newVersion)
-//                                } catch (failure: Throwable) {
-//                                    _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
-//                                }
-//                            }
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
                             popDraft()
                         }
diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list.xml b/vector/src/main/res/layout/bottom_sheet_generic_list.xml
index 966ad48b25..87a2cb54fc 100644
--- a/vector/src/main/res/layout/bottom_sheet_generic_list.xml
+++ b/vector/src/main/res/layout/bottom_sheet_generic_list.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent"
     android:background="?colorSurface"
     android:fadeScrollbars="false"
-    android:nestedScrollingEnabled="false"
     android:scrollbars="vertical"
     tools:itemCount="5"
     tools:listitem="@layout/item_bottom_sheet_action" />