[P1] Clean up the state

[tcharchian]

Review what’s currently stored, identify any leftovers, and remove them.

[Ryanchen911]

hi @tcharchian ,I will take this one, thank you!