Cleanup, with working incremental state.