diff --git a/data/90-fwupd-devices.rules b/data/90-fwupd-devices.rules
index 12b5fe991..9f0cd7624 100644
--- a/data/90-fwupd-devices.rules
+++ b/data/90-fwupd-devices.rules
@@ -4,21 +4,6 @@
 # SPDX-License-Identifier: LGPL-2.1+
 #
 
-# VIA USB 3.0 VL811 Hub
-SUBSYSTEM=="usb", DRIVER=="hub", ATTRS{idVendor}=="2109", ATTRS{idProduct}=="0810", ENV{FWUPD_GUID}="adbb9034-b577-42c2-a661-1ee4f49ef64c", ENV{FWUPD_VENDOR}="VIA", ENV{FWUPD_MODEL}="USB 3.0 VL811 Hub"
-
-# VIA USB 3.0 VL811+ Hub
-SUBSYSTEM=="usb", DRIVER=="hub", ATTRS{idVendor}=="2109", ATTRS{idProduct}=="0811", ENV{FWUPD_GUID}="54f84d05-c917-4c50-8b35-44feabaaa323", ENV{FWUPD_VENDOR}="VIA", ENV{FWUPD_MODEL}="USB 3.0 VL811+ Hub"
-
-# VIA USB 3.0 VL812 Hub
-SUBSYSTEM=="usb", DRIVER=="hub", ATTRS{idVendor}=="2109", ATTRS{idProduct}=="0812", ENV{FWUPD_GUID}="cd0314ec-b80f-4d1a-a24f-c409183a8b2d", ENV{FWUPD_VENDOR}="VIA", ENV{FWUPD_MODEL}="USB 3.0 VL812 Hub"
-
-# VIA USB 3.0 VL812 B2 Hub
-SUBSYSTEM=="usb", DRIVER=="hub", ATTRS{idVendor}=="2109", ATTRS{idProduct}=="2812", ENV{FWUPD_GUID}="26470009-97a8-4028-867a-bbbac6ee7bf0", ENV{FWUPD_VENDOR}="VIA", ENV{FWUPD_MODEL}="USB 3.0 VL812 B2 Hub"
-
-ENV{FWUPD_GUID}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
-ENV{FWUPD_GUID}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb"
-
 # PCI cards with ROM
 SUBSYSTEM=="pci", TEST=="/sys$devpath/rom", ENV{FWUPD_GUID}="$attr{vendor}:$attr{device}"
 
diff --git a/libfwupdplugin/fu-udev-device.c b/libfwupdplugin/fu-udev-device.c
index b730a13ce..c801b87e2 100644
--- a/libfwupdplugin/fu-udev-device.c
+++ b/libfwupdplugin/fu-udev-device.c
@@ -200,9 +200,6 @@ fu_udev_device_get_vendor_fallback (GUdevDevice *udev_device)
 {
 #ifdef HAVE_GUDEV
 	const gchar *tmp;
-	tmp = g_udev_device_get_property (udev_device, "FWUPD_VENDOR");
-	if (tmp != NULL)
-		return tmp;
 	tmp = g_udev_device_get_property (udev_device, "ID_VENDOR_FROM_DATABASE");
 	if (tmp != NULL)
 		return tmp;
@@ -310,9 +307,7 @@ fu_udev_device_probe (FuDevice *device, GError **error)
 
 	/* set model */
 	if (fu_device_get_name (device) == NULL) {
-		tmp = g_udev_device_get_property (priv->udev_device, "FWUPD_MODEL");
-		if (tmp == NULL)
-			tmp = g_udev_device_get_property (priv->udev_device, "ID_MODEL_FROM_DATABASE");
+		tmp = g_udev_device_get_property (priv->udev_device, "ID_MODEL_FROM_DATABASE");
 		if (tmp == NULL)
 			tmp = g_udev_device_get_property (priv->udev_device, "ID_MODEL");
 		if (tmp == NULL)