diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java
index 747eccb088..4502b688ff 100644
--- a/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java
+++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java
@@ -388,7 +388,6 @@ public final class GlEffectsFrameProcessorPixelTest {
   }
 
   @Test
-  // TODO(b/239757183): Consider moving RgbMatrix composition tests to a new file.
   public void drawFrame_grayscaleAndIncreaseRedChannel_producesGrayscaleAndRedImage()
       throws Exception {
     String testId = "drawFrame_grayscaleAndIncreaseRedChannel";
diff --git a/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java
index ef057ead45..ac90870d66 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java
@@ -169,7 +169,6 @@ public final class GlEffectsFrameProcessor implements FrameProcessor {
    *     The first is an {@link ExternalTextureProcessor} and the last is a {@link
    *     FinalMatrixTextureProcessorWrapper}.
    */
-  // TODO(b/239757183): Squash GlMatrixTransformation and RgbMatrix together.
   private static ImmutableList<GlTextureProcessor> getGlTextureProcessorsForGlEffects(
       Context context,
       List<Effect> effects,