diff --git a/src/lean_spec/subspecs/containers/state/__init__.py b/src/lean_spec/subspecs/containers/state/__init__.py
index 4bda075e..ac17c457 100644
--- a/src/lean_spec/subspecs/containers/state/__init__.py
+++ b/src/lean_spec/subspecs/containers/state/__init__.py
@@ -6,7 +6,6 @@
     JustificationRoots,
     JustificationValidators,
     JustifiedSlots,
-    StateLookup,
     Validators,
 )
 
@@ -16,6 +15,5 @@
     "JustificationValidators",
     "JustifiedSlots",
     "State",
-    "StateLookup",
     "Validators",
 ]
diff --git a/src/lean_spec/subspecs/containers/state/types.py b/src/lean_spec/subspecs/containers/state/types.py
index 33122848..3bdf406d 100644
--- a/src/lean_spec/subspecs/containers/state/types.py
+++ b/src/lean_spec/subspecs/containers/state/types.py
@@ -2,20 +2,12 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from lean_spec.subspecs.chain.config import DEVNET_CONFIG
 from lean_spec.types import Bytes32, SSZList
 from lean_spec.types.bitfields import BaseBitlist
 
 from ..validator import Validator
 
-if TYPE_CHECKING:
-    from .state import State
-
-StateLookup = dict[Bytes32, "State"]
-"""Mapping from state root to State objects."""
-
 
 class HistoricalBlockHashes(SSZList[Bytes32]):
     """List of historical block root hashes up to historical_roots_limit."""
diff --git a/src/lean_spec/subspecs/forkchoice/store.py b/src/lean_spec/subspecs/forkchoice/store.py
index c0a93e88..3f6934a8 100644
--- a/src/lean_spec/subspecs/forkchoice/store.py
+++ b/src/lean_spec/subspecs/forkchoice/store.py
@@ -33,7 +33,6 @@
 )
 from lean_spec.subspecs.containers.block import BlockLookup
 from lean_spec.subspecs.containers.slot import Slot
-from lean_spec.subspecs.containers.state import StateLookup
 from lean_spec.subspecs.ssz.hash import hash_tree_root
 from lean_spec.subspecs.xmss.aggregation import (
     AggregatedSignatureProof,
@@ -116,7 +115,7 @@ class Store(Container):
     Every block that might participate in fork choice must appear here.
     """
 
-    states: StateLookup = {}
+    states: dict[Bytes32, State] = {}
     """
     Mapping from state root to State objects.