Additional kvm branch cleanup