[MAT-437] clean up pass 1