diff --git a/ts/components/lightbox/LightboxGallery.tsx b/ts/components/lightbox/LightboxGallery.tsx
index 838936a96..e1ab69137 100644
--- a/ts/components/lightbox/LightboxGallery.tsx
+++ b/ts/components/lightbox/LightboxGallery.tsx
@@ -39,7 +39,6 @@ export const LightboxGallery = (props: Props) => {
   // just run once, when the component is mounted. It's to show the lightbox on the specified index at start.
   useMount(() => {
     setCurrentIndex(selectedIndex);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   });
 
   const selectedMedia = media[currentIndex];
diff --git a/ts/data/opengroups.ts b/ts/data/opengroups.ts
index 532460e57..36cc4051a 100644
--- a/ts/data/opengroups.ts
+++ b/ts/data/opengroups.ts
@@ -14,36 +14,6 @@ export type OpenGroupV2RoomWithImageID = {
   imageID?: string;
 };
 
-// export type OpenGroupV2Room = {
-//   serverUrl: string;
-
-//   /** this is actually shared for all this server's room */
-//   serverPublicKey: string;
-//   roomId: string;
-
-//   /** a user displayed name */
-//   roomName?: string;
-
-//   /** the fileId of the group room's image */
-//   imageID?: string;
-
-//   /** the linked ConversationModel.id */
-//   conversationId?: string;
-//   maxMessageFetchedSeqNo?: number;
-//   lastInboxIdFetched?: number;
-//   lastOutboxIdFetched?: number;
-
-//   /**
-//    * This value is set with the current timestamp whenever we get new messages.
-//    */
-//   lastFetchTimestamp?: number;
-
-//   /**
-//    * This is shared across all rooms in a server.
-//    */
-//   capabilities?: Array<string>;
-// };
-
 export const OpenGroupData = {
   getAllV2OpenGroupRoomsMap,
   opengroupRoomsLoad,
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index 139524343..f4f5af5be 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -307,15 +307,11 @@ export async function deleteEverythingAndNetworkData() {
       // clear each inbox per sogs
 
       const clearInboxPromises = allRoomInfosArray.map(async roomInfo => {
-        try {
-          const success = await clearInbox(roomInfo);
-          if (!success) {
-            throw Error(`Failed to clear inbox for ${roomInfo.conversationId}`);
-          }
-          return { status: 'fulfilled' };
-        } catch (error) {
-          return { status: 'rejected', reason: error };
+        const success = await clearInbox(roomInfo);
+        if (!success) {
+          throw Error(`Failed to clear inbox for ${roomInfo.conversationId}`);
         }
+        return true;
       });
 
       const results = await Promise.allSettled(clearInboxPromises);