Cleanup for version control