Auto-disable clean if a step that relies on it is skipped

Will result in a small count of trashed VMs.