clean up codebase