x86: Clean up the hypervisor layer