diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyRuleClasses.java
index e9c357d269cc02..4b9a34b53d8631 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPyRuleClasses.java
@@ -74,7 +74,7 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env)
                   .mandatoryProvidersList(
                       ImmutableList.of(
                           // Legacy provider.
-                          // TODO(#7010): Remove this legacy set.
+                          // TODO(b/153363654): Remove this legacy set.
                           ImmutableList.of(
                               SkylarkProviderIdentifier.forLegacy(PyStructUtils.PROVIDER_NAME)),
                           // Modern provider.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyProviderUtils.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyProviderUtils.java
index 0d8541db34bad1..d363eeb547b83b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyProviderUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyProviderUtils.java
@@ -32,6 +32,7 @@
  *
  * <p>This class exposes a unified view over both the legacy and modern Python providers.
  */
+// TODO(b/153363654): Delete this class, go directly through PyInfo instead.
 public class PyProviderUtils {
 
   // Disable construction.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyStructUtils.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyStructUtils.java
index 33ed69c709b8cf..245a27452a5173 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyStructUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyStructUtils.java
@@ -28,7 +28,7 @@
 import com.google.devtools.build.lib.syntax.SkylarkType;
 
 /** Static helper class for creating and accessing instances of the legacy "py" struct provider. */
-// TODO(#7010): Remove this in favor of PyInfo.
+// TODO(b/153363654): Remove this file.
 public class PyStructUtils {
 
   // Disable construction.