CGL cleanup