Stop using cl completely