Qc cleanup