More minor scrubbing