Continuing to scrub to codebase.