Made RHEV delete a little more robust

Made RHEV delete a little more robust

relies on #622