[TASK] CGL cleanup