codebase cleanup