diff --git a/java/google/registry/model/domain/token/AllocationToken.java b/java/google/registry/model/domain/token/AllocationToken.java
index bcc0f2ea7..c315fb23e 100644
--- a/java/google/registry/model/domain/token/AllocationToken.java
+++ b/java/google/registry/model/domain/token/AllocationToken.java
@@ -35,7 +35,6 @@ import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Index;
 import com.googlecode.objectify.annotation.Mapify;
-import com.googlecode.objectify.annotation.OnLoad;
 import google.registry.model.BackupGroupRoot;
 import google.registry.model.Buildable;
 import google.registry.model.CreateAutoTimestamp;
@@ -118,14 +117,6 @@ public class AllocationToken extends BackupGroupRoot implements Buildable {
   TimedTransitionProperty<TokenStatus, TokenStatusTransition> tokenStatusTransitions =
       TimedTransitionProperty.forMapify(NOT_STARTED, TokenStatusTransition.class);
 
-  // TODO(b/130301183): Remove this after loading/saving all token entities
-  @OnLoad
-  void onLoad() {
-    if (tokenType == null) {
-      tokenType = TokenType.SINGLE_USE;
-    }
-  }
-
   /**
    * A transition to a given token status at a specific time, for use in a TimedTransitionProperty.
    *
diff --git a/java/google/registry/tools/RegistryTool.java b/java/google/registry/tools/RegistryTool.java
index 1188c7992..7edc57a93 100644
--- a/java/google/registry/tools/RegistryTool.java
+++ b/java/google/registry/tools/RegistryTool.java
@@ -17,7 +17,6 @@ package google.registry.tools;
 import com.google.common.collect.ImmutableMap;
 import google.registry.tools.javascrap.PopulateNullRegistrarFieldsCommand;
 import google.registry.tools.javascrap.RemoveIpAddressCommand;
-import google.registry.tools.javascrap.ResaveAllocationTokensCommand;
 
 /** Container class to create and run remote commands against a Datastore instance. */
 public final class RegistryTool {
@@ -97,7 +96,6 @@ public final class RegistryTool {
           .put("registrar_contact", RegistrarContactCommand.class)
           .put("remove_ip_address", RemoveIpAddressCommand.class)
           .put("renew_domain", RenewDomainCommand.class)
-          .put("resave_allocation_tokens", ResaveAllocationTokensCommand.class)
           .put("resave_entities", ResaveEntitiesCommand.class)
           .put("resave_environment_entities", ResaveEnvironmentEntitiesCommand.class)
           .put("resave_epp_resource", ResaveEppResourceCommand.class)
diff --git a/java/google/registry/tools/javascrap/ResaveAllocationTokensCommand.java b/java/google/registry/tools/javascrap/ResaveAllocationTokensCommand.java
deleted file mode 100644
index b9c89c9de..000000000
--- a/java/google/registry/tools/javascrap/ResaveAllocationTokensCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2019 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.tools.javascrap;
-
-import static com.google.common.collect.Lists.partition;
-import static google.registry.model.ofy.ObjectifyService.ofy;
-
-import com.beust.jcommander.Parameters;
-import com.googlecode.objectify.Key;
-import google.registry.model.domain.token.AllocationToken;
-import google.registry.tools.MutatingCommand;
-import java.util.List;
-
-/** Scrap tool to load and save all {@link AllocationToken}s to populate on-load attributes. */
-@Parameters(commandDescription = "Load and resave all allocation tokens")
-public final class ResaveAllocationTokensCommand extends MutatingCommand {
-
-  private static final int BATCH_SIZE = 20;
-
-  @Override
-  protected void init() {
-    List<Key<AllocationToken>> tokenKeys = ofy().load().type(AllocationToken.class).keys().list();
-    for (List<Key<AllocationToken>> partitionedKeys : partition(tokenKeys, BATCH_SIZE)) {
-      for (Key<AllocationToken> key : partitionedKeys) {
-        AllocationToken token = ofy().load().key(key).now();
-        stageEntityChange(token, token);
-      }
-      flushTransaction();
-    }
-  }
-}