diff --git a/java/google/registry/env/common/tools/WEB-INF/web.xml b/java/google/registry/env/common/tools/WEB-INF/web.xml
index 4c8b24382..eb4f4aeb8 100644
--- a/java/google/registry/env/common/tools/WEB-INF/web.xml
+++ b/java/google/registry/env/common/tools/WEB-INF/web.xml
@@ -72,7 +72,6 @@
     <url-pattern>/_dr/task/resaveAllEppResources</url-pattern>
   </servlet-mapping>
 
-
   <!-- Mapreduce to delete EppResources, children, and indices. -->
   <servlet-mapping>
     <servlet-name>tools-servlet</servlet-name>
diff --git a/java/google/registry/model/billing/BillingEvent.java b/java/google/registry/model/billing/BillingEvent.java
index 1263e81a5..cce7463ec 100644
--- a/java/google/registry/model/billing/BillingEvent.java
+++ b/java/google/registry/model/billing/BillingEvent.java
@@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkState;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.util.CollectionUtils.forceEmptyToNull;
 import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
-import static google.registry.util.CollectionUtils.union;
 import static google.registry.util.DateTimeUtils.END_OF_TIME;
 import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
@@ -34,7 +33,6 @@ import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.IgnoreSave;
 import com.googlecode.objectify.annotation.Index;
-import com.googlecode.objectify.annotation.OnLoad;
 import com.googlecode.objectify.annotation.Parent;
 import com.googlecode.objectify.condition.IfNull;
 import google.registry.model.Buildable;
@@ -56,8 +54,6 @@ public abstract class BillingEvent extends ImmutableObject
 
   /** The reason for the bill, which maps 1:1 to skus in go/registry-billing-skus. */
   public enum Reason {
-    // TODO(b/27777398): Drop Reason.AUTO_RENEW after migration to Flag.AUTO_RENEW.
-    AUTO_RENEW,
     CREATE,
     @Deprecated // TODO(b/31676071): remove this legacy value once old data is cleaned up.
     ERROR,
@@ -335,15 +331,6 @@ public abstract class BillingEvent extends ImmutableObject
   @Entity
   public static class Recurring extends BillingEvent {
 
-    // TODO(b/27777398): Remove after migration is complete and Reason.AUTO_RENEW is removed.
-    @OnLoad
-    void setAutorenewFlag() {
-      if (Reason.AUTO_RENEW.equals(reason)) {
-        reason = Reason.RENEW;
-        flags = union(getFlags(), Flag.AUTO_RENEW);
-      }
-    }
-
     /**
      * The billing event recurs every year between {@link #eventTime} and this time on the
      * [month, day, time] specified in {@link #recurrenceTimeOfYear}.
diff --git a/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java b/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java
index 8a65445aa..197197705 100644
--- a/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java
+++ b/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java
@@ -120,7 +120,7 @@ public class ChildEntityInputTest {
     recurringA = persistResource(
         new BillingEvent.Recurring.Builder()
             .setParent(domainHistoryEntryA)
-            .setReason(Reason.AUTO_RENEW)
+            .setReason(Reason.RENEW)
             .setEventTime(now.plusYears(1))
             .setRecurrenceEndTime(END_OF_TIME)
             .setClientId("TheRegistrar")
@@ -150,7 +150,7 @@ public class ChildEntityInputTest {
     recurringB = persistResource(
         new BillingEvent.Recurring.Builder()
             .setParent(domainHistoryEntryA)
-            .setReason(Reason.AUTO_RENEW)
+            .setReason(Reason.RENEW)
             .setEventTime(now.plusYears(1))
             .setRecurrenceEndTime(END_OF_TIME)
             .setClientId("TheRegistrar")
diff --git a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
index 077613004..3e32f75a2 100644
--- a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
+++ b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
@@ -129,7 +129,7 @@ public class KillAllEppResourcesActionTest extends MapreduceTestCase<KillAllEppR
               .setEventTime(START_OF_TIME)
               .setClientId("")
               .setTargetId("")
-              .setReason(Reason.AUTO_RENEW)
+              .setReason(Reason.RENEW)
               .build())) {
         persistResource(descendant);
       }