Added remove hypervisor functionality