Phase 2 - File clean up from previous.