diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallSuggester.java b/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallSuggester.java
index 341a0d119fa..31df7ff1198 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallSuggester.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/DoNotCallSuggester.java
@@ -188,7 +188,7 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
         .build();
   }
 
-  // this code is stolen from MissingOverride.java
+  // TODO(b/216306810): copied from MissingOverride.java
   private static boolean isEffectivelyOverride(Symbol sym, Types types) {
     // static methods can't be overrides
     if (sym.isStatic()) {
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MissingOverride.java b/core/src/main/java/com/google/errorprone/bugpatterns/MissingOverride.java
index 36729bad631..e570f87ad11 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/MissingOverride.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/MissingOverride.java
@@ -94,6 +94,7 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
    * Returns the {@link MethodSymbol} of the first method that sym overrides in its supertype
    * closure, or {@code null} if no such method exists.
    */
+  // TODO(b/216306810): consider adding a generalized version of this to ASTHelpers
   @Nullable
   private MethodSymbol getFirstOverride(Symbol sym, Types types) {
     ClassSymbol owner = sym.enclClass();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java b/core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java
index d1652241600..691ff706088 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java
@@ -117,7 +117,7 @@ private static boolean shouldApplyApiChecks(Tree tree, VisitorState state) {
     return true;
   }
 
-  // Copied from MissingOverride.java
+  // TODO(b/216306810): copied from MissingOverride.java
   private static boolean isEffectivelyOverride(Symbol sym, Types types) {
     // static methods can't be overrides
     if (sym.isStatic()) {