cleanup for CL