Added skip_cleanup.