diff --git a/libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java b/libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java
index ecddad5c71..82b0775a89 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/GlProgram.java
@@ -147,8 +147,6 @@ public final class GlProgram {
    * <p>Call this in the rendering loop to switch between different programs.
    */
   public void use() {
-    // TODO(b/214975934): When multiple GL programs are supported by Transformer, make sure
-    // to call use() to switch between programs.
     GLES20.glUseProgram(programId);
     GlUtil.checkGlError();
   }
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AdvancedFrameProcessorPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AdvancedFrameProcessorPixelTest.java
index 53e5c7cb7a..895d10af18 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AdvancedFrameProcessorPixelTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AdvancedFrameProcessorPixelTest.java
@@ -58,8 +58,6 @@ public final class AdvancedFrameProcessorPixelTest {
   private @MonotonicNonNull GlFrameProcessor advancedFrameProcessor;
   private int inputTexId;
   private int outputTexId;
-  // TODO(b/214975934): Once the frame processors are allowed to have different input and output
-  //  dimensions, get the output dimensions from the frame processor.
   private int width;
   private int height;
 
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/GlFrameProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/GlFrameProcessor.java
index 63f44b2bc2..9bf254965a 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/GlFrameProcessor.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/GlFrameProcessor.java
@@ -34,7 +34,7 @@ import java.io.IOException;
  */
 @UnstableApi
 public interface GlFrameProcessor {
-  // TODO(b/214975934): Investigate whether all configuration can be moved to initialize by
+  // TODO(b/213313666): Investigate whether all configuration can be moved to initialize by
   //  using a placeholder surface until the encoder surface is known. If so, convert
   //  configureOutputSize to a simple getter.