Added back skip_cleanup