More cleanup of cli