Cleanup, Phase 2