diff --git a/data/database.py b/data/database.py
index c87ece328..4e56c7019 100644
--- a/data/database.py
+++ b/data/database.py
@@ -484,7 +484,6 @@ class EmailConfirmation(BaseModel):
 
 class ImageStorage(BaseModel):
   uuid = CharField(default=uuid_generator, index=True, unique=True)
-  checksum = CharField(null=True)  # TODO remove when all checksums have been moved back to Image
   image_size = BigIntegerField(null=True)
   uncompressed_size = BigIntegerField(null=True)
   uploading = BooleanField(default=True, null=True)
diff --git a/data/model/image.py b/data/model/image.py
index 7b673ee2f..283dfa01d 100644
--- a/data/model/image.py
+++ b/data/model/image.py
@@ -294,7 +294,6 @@ def set_image_metadata(docker_image_id, namespace_name, repository_name, created
 
     # We cleanup any old checksum in case it's a retry after a fail
     fetched.v1_checksum = None
-    fetched.storage.checksum = None # TODO remove when storage checksums are no longer read
     fetched.storage.content_checksum = None
 
     fetched.comment = comment
diff --git a/endpoints/v1/registry.py b/endpoints/v1/registry.py
index 72f8843f5..096d51e73 100644
--- a/endpoints/v1/registry.py
+++ b/endpoints/v1/registry.py
@@ -441,7 +441,6 @@ def store_checksum(image_with_storage, checksum, content_checksum):
     return 'Invalid checksum format'
 
   # We store the checksum
-  image_with_storage.storage.checksum = checksum  # TODO remove when v1 checksums are on image only
   image_with_storage.storage.content_checksum = content_checksum
   image_with_storage.storage.save()