diff --git a/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml b/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
index 5b48c1b3e..f54000d2d 100644
--- a/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
+++ b/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
@@ -66,7 +66,6 @@
         <property name="modificationTime" direction="asc"/>
     </datastore-index>
     <!-- For RDAP. -->
-    <!-- TODO(b/25644770): Backfill these indexes. -->
     <datastore-index kind="DomainBase" ancestor="false" source="manual">
         <property name="^i" direction="asc"/>
         <property name="fullyQualifiedDomainName" direction="asc"/>
diff --git a/java/google/registry/model/host/HostResource.java b/java/google/registry/model/host/HostResource.java
index 777316a8a..703afa9ff 100644
--- a/java/google/registry/model/host/HostResource.java
+++ b/java/google/registry/model/host/HostResource.java
@@ -75,7 +75,6 @@ public class HostResource extends EppResource implements ForeignKeyedEppResource
    * from (creationTime, deletionTime) there can only be one host in the datastore with this name.
    * However, there can be many hosts with the same name and non-overlapping lifetimes.
    */
-  // TODO(b/25644770): Backfill this index. Until that's done, don't rely on it!
   @Index
   @XmlTransient
   String fullyQualifiedHostName;