CLI cleanups