more cleanup in cli