cleaning up, phase 2