cli cleanup