more cli cleanup