scrubbing old code