cleaning up entire codebase