Clean up command line client