Use cl-lib instead of cl.el