[TASK] CGL cleanup in bootstrap