Added skip_cleanup