Clean up after QCRIL merge