Just need to remove some unnecessary states.