Added option to skip cleanup