clean-up for phase 1