More cleanup of the derived cl.