Need lvm2 in the VM, as well
Clean up some cleanup functions