Cleanup of codebase