Sender cli cleanup