CGL Cleanup