Code Cleaning for Opening Source (Phase 3/5)