more cleanup before more building