Get rid of reference to the state.