diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
index 9a4e5925ee..ca20c769dc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
@@ -98,7 +98,6 @@ public class DefaultDownloaderFactory implements DownloaderFactory {
       throw new IllegalStateException("Module missing for: " + request.type);
     }
     try {
-      // TODO: Support customCacheKey in DASH/HLS/SS, for completeness.
       return constructor.newInstance(request.uri, request.streamKeys, downloaderConstructorHelper);
     } catch (Exception e) {
       throw new RuntimeException("Failed to instantiate downloader for: " + request.type, e);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
index 915f375027..df958f8691 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
@@ -485,8 +485,6 @@ public final class DownloadManager {
     return true;
   }
 
-  // TODO: Merge these three events into a single MSG_STATE_CHANGE that can carry all updates. This
-  // allows updating idle at the same point as the downloads that can be queried changes.
   private void onInitialized(List<Download> downloads) {
     initialized = true;
     this.downloads.addAll(downloads);