[WIP] - Fix RHEV destroy