diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
index 66344107a4..d060e3996d 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
@@ -52,7 +52,7 @@ class SharedSecuredStorageResetAllFragment :
 
         views.ssssResetOtherDevices.debouncedClicks {
             withState(sharedViewModel) {
-                DeviceListBottomSheet.newInstance(it.userId, false).show(childFragmentManager, "DEV_LIST")
+                DeviceListBottomSheet.newInstance(it.userId).show(childFragmentManager, "DEV_LIST")
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
index 2dbb03121d..63c44b4000 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
@@ -100,13 +100,12 @@ class DeviceListBottomSheet :
     @Parcelize
     data class Args(
             val userId: String,
-            val allowDeviceAction: Boolean
     ) : Parcelable
 
     companion object {
-        fun newInstance(userId: String, allowDeviceAction: Boolean = true): DeviceListBottomSheet {
+        fun newInstance(userId: String): DeviceListBottomSheet {
             return DeviceListBottomSheet().apply {
-                setArguments(Args(userId, allowDeviceAction))
+                setArguments(Args(userId))
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
index 983790c80a..7709a63344 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
@@ -22,8 +22,6 @@ import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 // TODO Replace usage by the use case GetEncryptionTrustLevelForDeviceUseCase
 object TrustUtils {
 
-    // XXX why is this using the RoomEncryptionTrustLevel?
-    // should be using a new DeviceTrustShield enum
     fun shieldForTrust(
             currentDevice: Boolean,
             trustMSK: Boolean,
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCase.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCase.kt
index 268ae86601..762a636494 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/verification/GetEncryptionTrustLevelForDeviceUseCase.kt
@@ -25,6 +25,8 @@ class GetEncryptionTrustLevelForDeviceUseCase @Inject constructor(
         private val getEncryptionTrustLevelForOtherDeviceUseCase: GetEncryptionTrustLevelForOtherDeviceUseCase,
 ) {
 
+    // XXX why is this using the RoomEncryptionTrustLevel?
+    // should be using a new DeviceTrustShield enum
     fun execute(currentSessionCrossSigningInfo: CurrentSessionCrossSigningInfo, cryptoDeviceInfo: CryptoDeviceInfo?): RoomEncryptionTrustLevel? {
         if (cryptoDeviceInfo == null) {
             return null