some more cleanup on cli