fix cleanups on state game
fix cleanups for state map