q2 clean up