2nd stage cleanup