clean up, phase #3