cleanup - phase 1