Fix a horrible performance bug in scrubbing
no_scrub no longer needed