Clean for new codebase