[TASK] Minoro CGL cleanup