Clean up for Phase 1