Fixed gamestate removal