CQC cleaned up