[TASK] CGL cleanup for the new module menu classes