cleanup q7