scrubbing down unused code