diff --git a/README.md b/README.md
index d6f4df8a..91f28152 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ struct StateEvent {
 }
 
 /// A mapping of event type and state_key to some value `T`, usually an `EventId`.
-pub type StateMap<T> = BTreeMap<(EventType, Option<String>), T>;
+pub type StateMap<T> = BTreeMap<(EventType, String), T>;
 
 /// A mapping of `EventId` to `T`, usually a `StateEvent`.
 pub type EventMap<T> = BTreeMap<EventId, T>;
diff --git a/tests/state_res.rs b/tests/state_res.rs
index 7b8110dd..00efa3a4 100644
--- a/tests/state_res.rs
+++ b/tests/state_res.rs
@@ -429,10 +429,6 @@ fn do_check(
 
         // we have to update our store, an actual user of this lib would
         // be giving us state from a DB.
-        //
-        // TODO
-        // TODO we need to convert the `StateResolution::resolve` to use the event_map
-        // because the user of this crate cannot update their DB's state.
         store.0.insert(ev_id.clone(), Arc::clone(&event));
 
         state_at_event.insert(node, state_after);