diff --git a/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java b/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
index e0fb20f265..daec88d9c4 100644
--- a/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
+++ b/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
@@ -101,7 +101,6 @@ public int getHeight() {
     return height;
   }
 
-  // TODO the following function can prob. be deleted now. Adb may be able to tell me some context why it was introduced.
   public String getRealPath(Context context) {
     try {
       // get file in the blobdir as `<blobdir>/<name>[-<uniqueNumber>].<ext>`
diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
index 1d9a41d5ae..3d35959b90 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
@@ -367,7 +367,13 @@ private static String checkMime(String path, String mimeType) {
     return mimeType;
   }
 
-  // TODO the following function can prob. be simplified and unified with the next fn now.
+  /**
+   * Return the path of a not-yet-existing file in the blobdir with roughly the given filename
+   * and the given extension.
+   * In many cases, since we're using setFileAndDeduplicate now, this wouldn't be necessary anymore
+   * and we could just create a file with a random filename,
+   * but there are a few usages that still need the current behavior (like `openMaps()`).
+   */
   public static String getBlobdirFile(DcContext dcContext, String filename, String ext) {
     filename = FileUtils.sanitizeFilename(filename);
     ext = FileUtils.sanitizeFilename(ext);
diff --git a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 6836e392b3..77bd46add4 100644
--- a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -360,7 +360,6 @@ public void onReceivedDuration(int millis) {
         return null;
       }
 
-      // TODO we should be able to revert the changes here
       private @NonNull Slide getManuallyCalculatedSlideInfo(Uri uri, int width, int height, @Nullable DcMsg msg) throws IOException {
         long start      = System.currentTimeMillis();
         Long mediaSize  = null;