Any objections to renaming this method to `cleanup`? I think `state.cleanUpState` is a bit redundant (also personally prefer cleanup over  cleanUp---but I can go either way with that.)