added no-cleanup option