cleanup, phase 1