[TASK] Some cgl cleanup