Remove option to skip cleanup.