Remove duplicate hypervisor check outside of org