Removed 'skip_cleanup'