Made RHEV delete a little more robust