Remove unnecessary flags from State.