Get rid of superfluous state.