Added --no-cleanup and --no-patching options.