CGL Clean-up