Further cleanup of VDI drive setup in the VM