Move GamePlayer.remove_choice() to State.next_state()