Clean up for standard Phase 1