diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 1a55f6d2..992482f2 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -4163,7 +4163,6 @@
       <packagereq>lightdm</packagereq>
       <packagereq>lightdm-gtk</packagereq>
       <packagereq>initial-setup</packagereq>
-      <packagereq type="optional">abrt-desktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>libmatekbd</packagereq>
       <packagereq>libmatekeyring</packagereq>
@@ -4189,7 +4188,6 @@
       <packagereq>mate-media</packagereq>
       <packagereq>mate-menu-editor</packagereq>
       <packagereq>mate-menus</packagereq>
-      <packagereq>mate-netspeed</packagereq>
       <packagereq>mate-notification-daemon</packagereq>
       <packagereq>mate-panel</packagereq>
       <packagereq>mate-polkit</packagereq>
@@ -4211,9 +4209,7 @@
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
-      <packagereq type="optional">nm-connection-editor</packagereq>
       <packagereq>brasero</packagereq>
-      <packagereq type="optional">clearlooks-compact-gnome-theme</packagereq>
       <packagereq>dconf</packagereq>
       <packagereq>dconf-editor</packagereq>
       <packagereq>desktop-backgrounds-basic</packagereq>
@@ -4221,7 +4217,6 @@
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>geany</packagereq>
-      <packagereq type="optional">gnome-theme-curvylooks</packagereq>
       <packagereq>gvfs</packagereq>
       <packagereq>gvfs-smb</packagereq>
       <packagereq>gvfs-fuse</packagereq>
@@ -4230,15 +4225,13 @@
       <packagereq>gtk2-engines</packagereq>
       <packagereq>hexchat</packagereq>
       <packagereq>imsettings</packagereq>
-      <packagereq type="optional">nimbus-theme-gnome</packagereq>
-      <packagereq type="mandatory">>pavucontrol</packagereq>
+      <packagereq>pavucontrol</packagereq>
       <packagereq>pidgin</packagereq>
       <packagereq>simple-scan</packagereq>
-      <packagereq type="optional">thunderbird</packagereq>
+      <packagereq>thunderbird</packagereq>
       <packagereq>tigervnc</packagereq>
       <packagereq>transmission-gtk</packagereq>
       <packagereq>vim-enhanced</packagereq>
-      <packagereq type="optional">vinagre</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq>yumex</packagereq>
     </packagelist>