cleanup on codebase