PXE refactor
Made RHEV delete a little more robust