diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index afb373dc..1abe1233 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -2883,21 +2883,11 @@
       <packagereq type="default">libgnome-keyring-devel</packagereq>
       <packagereq type="default">libnotify-devel</packagereq>
       <packagereq type="optional">anjuta</packagereq>
-      <packagereq type="optional">anjuta-doc</packagereq>
       <packagereq type="optional">at-spi-devel</packagereq>
       <packagereq type="optional">bakery-devel</packagereq>
-      <packagereq type="optional">bit-devel</packagereq>
-      <packagereq type="optional">bit-gtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
       <packagereq type="optional">cairomm-doc</packagereq>
       <packagereq type="optional">clutter-gst-devel</packagereq>
-      <packagereq type="optional">conexus-dbus-devel</packagereq>
-      <packagereq type="optional">conexus-devel</packagereq>
-      <packagereq type="optional">conexus-doc</packagereq>
-      <packagereq type="optional">conexus-gtkmm-devel</packagereq>
-      <packagereq type="optional">conexus-nspr-devel</packagereq>
-      <packagereq type="optional">conexus-nss-devel</packagereq>
-      <packagereq type="optional">conexus-ssl-devel</packagereq>
       <packagereq type="optional">ddd</packagereq>
       <packagereq type="optional">gazpacho</packagereq>
       <packagereq type="optional">GConf2-devel</packagereq>
@@ -2910,9 +2900,7 @@
       <packagereq type="optional">gnome-python2-gda-devel</packagereq>
       <packagereq type="optional">gnome-valgrind-session</packagereq>
       <packagereq type="optional">gnome-vfs2-devel</packagereq>
-      <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
       <packagereq type="optional">gob2</packagereq>
-      <packagereq type="optional">gquilt</packagereq>
       <packagereq type="optional">gtk+extra</packagereq>
       <packagereq type="optional">gtkdatabox-devel</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
@@ -2920,29 +2908,19 @@
       <packagereq type="optional">libart_lgpl-devel</packagereq>
       <packagereq type="optional">libbonobo-devel</packagereq>
       <packagereq type="optional">libbonoboui-devel</packagereq>
-      <packagereq type="optional">libgconf-java</packagereq>
-      <packagereq type="optional">libglade-java</packagereq>
       <packagereq type="optional">libglade2-devel</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>
       <packagereq type="optional">libgnome-devel</packagereq>
-      <packagereq type="optional">libgnome-java</packagereq>
       <packagereq type="optional">libgnomecanvas-devel</packagereq>
       <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
-      <packagereq type="optional">libgnomemm26-devel</packagereq>
       <packagereq type="optional">libgnomeprintui22-devel</packagereq>
       <packagereq type="optional">libgnomeui-devel</packagereq>
-      <packagereq type="optional">libgnomeuimm26-devel</packagereq>
-      <packagereq type="optional">libgtk-java</packagereq>
       <packagereq type="optional">libgtop2-devel</packagereq>
       <packagereq type="optional">libsexy-devel</packagereq>
       <packagereq type="optional">libsexymm-devel</packagereq>
       <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">nemiver</packagereq>
       <packagereq type="optional">ORBit2-devel</packagereq>
-      <packagereq type="optional">papyrus-devel</packagereq>
-      <packagereq type="optional">papyrus-doc</packagereq>
-      <packagereq type="optional">papyrus-extras-devel</packagereq>
-      <packagereq type="optional">papyrus-gtkmm-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
       <packagereq type="optional">pygtk2-devel</packagereq>
       <packagereq type="optional">scim-devel</packagereq>
diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 9d3c5e67..bac73930 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -2606,21 +2606,11 @@
       <packagereq type="default">libgnome-keyring-devel</packagereq>
       <packagereq type="default">libnotify-devel</packagereq>
       <packagereq type="optional">anjuta</packagereq>
-      <packagereq type="optional">anjuta-doc</packagereq>
       <packagereq type="optional">at-spi-devel</packagereq>
       <packagereq type="optional">bakery-devel</packagereq>
-      <packagereq type="optional">bit-devel</packagereq>
-      <packagereq type="optional">bit-gtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
       <packagereq type="optional">cairomm-doc</packagereq>
       <packagereq type="optional">clutter-gst-devel</packagereq>
-      <packagereq type="optional">conexus-dbus-devel</packagereq>
-      <packagereq type="optional">conexus-devel</packagereq>
-      <packagereq type="optional">conexus-doc</packagereq>
-      <packagereq type="optional">conexus-gtkmm-devel</packagereq>
-      <packagereq type="optional">conexus-nspr-devel</packagereq>
-      <packagereq type="optional">conexus-nss-devel</packagereq>
-      <packagereq type="optional">conexus-ssl-devel</packagereq>
       <packagereq type="optional">ddd</packagereq>
       <packagereq type="optional">gazpacho</packagereq>
       <packagereq type="optional">GConf2-devel</packagereq>
@@ -2633,9 +2623,7 @@
       <packagereq type="optional">gnome-python2-gda-devel</packagereq>
       <packagereq type="optional">gnome-valgrind-session</packagereq>
       <packagereq type="optional">gnome-vfs2-devel</packagereq>
-      <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
       <packagereq type="optional">gob2</packagereq>
-      <packagereq type="optional">gquilt</packagereq>
       <packagereq type="optional">gtk+extra</packagereq>
       <packagereq type="optional">gtkdatabox-devel</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
@@ -2643,29 +2631,19 @@
       <packagereq type="optional">libart_lgpl-devel</packagereq>
       <packagereq type="optional">libbonobo-devel</packagereq>
       <packagereq type="optional">libbonoboui-devel</packagereq>
-      <packagereq type="optional">libgconf-java</packagereq>
-      <packagereq type="optional">libglade-java</packagereq>
       <packagereq type="optional">libglade2-devel</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>
       <packagereq type="optional">libgnome-devel</packagereq>
-      <packagereq type="optional">libgnome-java</packagereq>
       <packagereq type="optional">libgnomecanvas-devel</packagereq>
       <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
-      <packagereq type="optional">libgnomemm26-devel</packagereq>
       <packagereq type="optional">libgnomeprintui22-devel</packagereq>
       <packagereq type="optional">libgnomeui-devel</packagereq>
-      <packagereq type="optional">libgnomeuimm26-devel</packagereq>
-      <packagereq type="optional">libgtk-java</packagereq>
       <packagereq type="optional">libgtop2-devel</packagereq>
       <packagereq type="optional">libsexy-devel</packagereq>
       <packagereq type="optional">libsexymm-devel</packagereq>
       <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">nemiver</packagereq>
       <packagereq type="optional">ORBit2-devel</packagereq>
-      <packagereq type="optional">papyrus-devel</packagereq>
-      <packagereq type="optional">papyrus-doc</packagereq>
-      <packagereq type="optional">papyrus-extras-devel</packagereq>
-      <packagereq type="optional">papyrus-gtkmm-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
       <packagereq type="optional">pygtk2-devel</packagereq>
       <packagereq type="optional">scim-devel</packagereq>