Cleaning out part of the codebase