Source code cleanup (Phase 2)