diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 80563b2..a713eda 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -897,51 +897,16 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">aic94xx-firmware</packagereq>
-      <packagereq type="default">alsa-firmware</packagereq>
-      <packagereq type="default">atmel-firmware</packagereq>
-      <packagereq type="default">b43-fwcutter</packagereq>
-      <packagereq type="default">b43-openfwwf</packagereq>
-      <packagereq type="default">ipw2100-firmware</packagereq>
-      <packagereq type="default">ipw2200-firmware</packagereq>
-      <packagereq type="default">ivtv-firmware</packagereq>
-      <packagereq type="default">iwl100-firmware</packagereq>
-      <packagereq type="default">iwl105-firmware</packagereq>
-      <packagereq type="default">iwl135-firmware</packagereq>
-      <packagereq type="default">iwl1000-firmware</packagereq>
-      <packagereq type="default">iwl2000-firmware</packagereq>
-      <packagereq type="default">iwl2030-firmware</packagereq>
-      <packagereq type="default">iwl3160-firmware</packagereq>
-      <packagereq type="default">iwl3945-firmware</packagereq>
-      <packagereq type="default">iwl4965-firmware</packagereq>
-      <packagereq type="default">iwl5000-firmware</packagereq>
-      <packagereq type="default">iwl5150-firmware</packagereq>
-      <packagereq type="default">iwl6000-firmware</packagereq>
-      <packagereq type="default">iwl6000g2a-firmware</packagereq>
-      <packagereq type="default">iwl6000g2b-firmware</packagereq>
-      <packagereq type="default">iwl6050-firmware</packagereq>
-      <packagereq type="default">iwl7260-firmware</packagereq>
-      <packagereq type="default">libertas-usb8388-firmware</packagereq>
-      <packagereq type="default">ql2100-firmware</packagereq>
-      <packagereq type="default">ql2200-firmware</packagereq>
-      <packagereq type="default">ql23xx-firmware</packagereq>
       <packagereq type="default">usb_modeswitch</packagereq>
-      <packagereq type="default">zd1211-firmware</packagereq>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">cmospwd</packagereq>
       <packagereq type="optional">firmware-addon-dell</packagereq>
-      <packagereq type="optional">gpsd</packagereq>
-      <packagereq type="optional">gpsd-clients</packagereq>
-      <packagereq type="optional">gypsy</packagereq>
       <packagereq type="optional">hddtemp</packagereq>
       <packagereq type="optional">hdparm</packagereq>
       <packagereq type="optional">i8kutils</packagereq>
-      <packagereq type="optional">iscan-firmware</packagereq>
-      <packagereq type="optional">isight-firmware-tools</packagereq>
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
-      <packagereq type="optional">multican</packagereq>
       <packagereq type="optional">openct</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">pcsc-lite</packagereq>