Clean up cli