[TASK] Cleanup CGL