diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index 150f7f4c51..6ba77ce83f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -128,9 +128,7 @@ public class MmsSmsDatabase extends Database {
   public Cursor getConversationSnippet(long threadId) {
     String order     = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
     String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
-
-    // FIXME: Not sure if this will cause any performance issues
-    // return queryTables(PROJECTION, selection, order, "1");
+    
     return queryTables(PROJECTION, selection, order, null);
   }
 
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
index dbea3687f7..de2b8a349c 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -161,7 +161,6 @@ fun MessageReceiver.handleUnsendRequest(message: UnsendRequest) {
     }
     messageDataProvider.updateMessageAsDeleted(timestamp, author)
     if (!messageDataProvider.isOutgoingMessage(messageIdToDelete)) {
-        // FIXME: Not sure if there is any performance issue here
         SSKEnvironment.shared.notificationManager.updateNotification(context)
     }
 }