Improve cleanup and shutdown for calling comparisons from command line