cleanup: codebase