Added cleanup option to command line utility