diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index a48b0ebb..b4be71f9 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -5120,21 +5120,6 @@
       <packagereq type="optional">urg-devel</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>romanian-support</id>
-    <_name>Romanian Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>ro</langonly>
-    <packagelist>
-      <packagereq type="mandatory">terminus-fonts-console</packagereq>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-      <packagereq type="optional">terminus-fonts</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>ruby</id>
     <_name>Ruby</_name>
@@ -5196,20 +5181,6 @@
       <packagereq type="default">samyak-devanagari-fonts</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>serbian-support</id>
-    <_name>Serbian Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>sr</langonly>
-    <packagelist>
-      <packagereq type="optional">apanov-edrip-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>server-cfg</id>
     <_name>Server Configuration Tools</_name>
@@ -5291,32 +5262,6 @@
       <packagereq type="optional">scim-sayura</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>slovak-support</id>
-    <_name>Slovak Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>sk</langonly>
-    <packagelist>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>slovenian-support</id>
-    <_name>Slovenian Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>sl</langonly>
-    <packagelist>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>smb-server</id>
     <_name>Windows File Server</_name>
@@ -5465,17 +5410,6 @@
       <packagereq type="optional">xmp</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>spanish-support</id>
-    <_name>Spanish Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>es</langonly>
-    <packagelist>
-      <packagereq type="optional">man-pages-es-extra</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>sql-server</id>
     <_name>PostgreSQL Database</_name>
@@ -5932,33 +5866,6 @@
       <packagereq type="optional">taipeifonts</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>turkish-support</id>
-    <_name>Turkish Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>tr</langonly>
-    <packagelist>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>ukrainian-support</id>
-    <_name>Ukrainian Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>uk</langonly>
-    <packagelist>
-      <packagereq type="optional">apanov-edrip-fonts</packagereq>
-      <packagereq type="optional">fonts-KOI8-R</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>urdu-support</id>
     <_name>Urdu Support</_name>
@@ -6003,17 +5910,6 @@
       <packagereq type="optional">paktype-naskh-basic-urdu-fonts</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>vietnamese-support</id>
-    <_name>Vietnamese Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>vi</langonly>
-    <packagelist>
-      <packagereq type="optional">scim-tables-vietnamese</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>virtualization</id>
     <_name>Virtualization</_name>
@@ -6472,9 +6368,7 @@
       <groupid>bhutanese-support</groupid>
       <groupid>bodo-support</groupid>
       <groupid>burmese-support</groupid>
-      <groupid>czech-support</groupid>
       <groupid>dogri-support</groupid>
-      <groupid>estonian-support</groupid>
       <groupid>ethiopic-support</groupid>
       <groupid>finnish-support</groupid>
       <groupid>georgian-support</groupid>
@@ -6497,7 +6391,6 @@
       <groupid>oriya-support</groupid>
       <groupid>persian-support</groupid>
       <groupid>punjabi-support</groupid>
-      <groupid>romanian-support</groupid>
       <groupid>russian-support</groupid>
       <groupid>sanskrit-support</groupid>
       <groupid>santali-support</groupid>
@@ -6505,18 +6398,12 @@
       <groupid>simplified-chinese-support</groupid>
       <groupid>sindhi-support</groupid>
       <groupid>sinhala-support</groupid>
-      <groupid>slovak-support</groupid>
-      <groupid>slovenian-support</groupid>
-      <groupid>spanish-support</groupid>
       <groupid>tamil-support</groupid>
       <groupid>telugu-support</groupid>
       <groupid>thai-support</groupid>
       <groupid>tibetan-support</groupid>
       <groupid>traditional-chinese-support</groupid>
-      <groupid>turkish-support</groupid>
-      <groupid>ukrainian-support</groupid>
       <groupid>urdu-support</groupid>
-      <groupid>vietnamese-support</groupid>
       <groupid>yiddish-support</groupid>
     </grouplist>
   </category>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index ab37db78..c7debb71 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -5102,21 +5102,6 @@
       <packagereq type="optional">urg-devel</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>romanian-support</id>
-    <_name>Romanian Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>ro</langonly>
-    <packagelist>
-      <packagereq type="mandatory">terminus-fonts-console</packagereq>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-      <packagereq type="optional">terminus-fonts</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>ruby</id>
     <_name>Ruby</_name>
@@ -5178,20 +5163,6 @@
       <packagereq type="default">samyak-devanagari-fonts</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>serbian-support</id>
-    <_name>Serbian Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>sr</langonly>
-    <packagelist>
-      <packagereq type="optional">apanov-edrip-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>server-cfg</id>
     <_name>Server Configuration Tools</_name>
@@ -5273,32 +5244,6 @@
       <packagereq type="optional">scim-sayura</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>slovak-support</id>
-    <_name>Slovak Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>sk</langonly>
-    <packagelist>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>slovenian-support</id>
-    <_name>Slovenian Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>sl</langonly>
-    <packagelist>
-      <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
-      <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>smb-server</id>
     <_name>Windows File Server</_name>
@@ -5447,17 +5392,6 @@
       <packagereq type="optional">xmp</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>spanish-support</id>
-    <_name>Spanish Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>es</langonly>
-    <packagelist>
-      <packagereq type="optional">man-pages-es-extra</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>sql-server</id>
     <_name>PostgreSQL Database</_name>
@@ -5914,33 +5848,6 @@
       <packagereq type="optional">taipeifonts</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>turkish-support</id>
-    <_name>Turkish Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>tr</langonly>
-    <packagelist>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-100dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-9-75dpi</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>ukrainian-support</id>
-    <_name>Ukrainian Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>uk</langonly>
-    <packagelist>
-      <packagereq type="optional">apanov-edrip-fonts</packagereq>
-      <packagereq type="optional">fonts-KOI8-R</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
-      <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>urdu-support</id>
     <_name>Urdu Support</_name>
@@ -5985,17 +5892,6 @@
       <packagereq type="optional">paktype-naskh-basic-urdu-fonts</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>vietnamese-support</id>
-    <_name>Vietnamese Support</_name>
-    <_description/>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <langonly>vi</langonly>
-    <packagelist>
-      <packagereq type="optional">scim-tables-vietnamese</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>virtualization</id>
     <_name>Virtualization</_name>
@@ -6454,9 +6350,7 @@
       <groupid>bhutanese-support</groupid>
       <groupid>bodo-support</groupid>
       <groupid>burmese-support</groupid>
-      <groupid>czech-support</groupid>
       <groupid>dogri-support</groupid>
-      <groupid>estonian-support</groupid>
       <groupid>ethiopic-support</groupid>
       <groupid>finnish-support</groupid>
       <groupid>georgian-support</groupid>
@@ -6479,7 +6373,6 @@
       <groupid>oriya-support</groupid>
       <groupid>persian-support</groupid>
       <groupid>punjabi-support</groupid>
-      <groupid>romanian-support</groupid>
       <groupid>russian-support</groupid>
       <groupid>sanskrit-support</groupid>
       <groupid>santali-support</groupid>
@@ -6487,18 +6380,12 @@
       <groupid>simplified-chinese-support</groupid>
       <groupid>sindhi-support</groupid>
       <groupid>sinhala-support</groupid>
-      <groupid>slovak-support</groupid>
-      <groupid>slovenian-support</groupid>
-      <groupid>spanish-support</groupid>
       <groupid>tamil-support</groupid>
       <groupid>telugu-support</groupid>
       <groupid>thai-support</groupid>
       <groupid>tibetan-support</groupid>
       <groupid>traditional-chinese-support</groupid>
-      <groupid>turkish-support</groupid>
-      <groupid>ukrainian-support</groupid>
       <groupid>urdu-support</groupid>
-      <groupid>vietnamese-support</groupid>
       <groupid>yiddish-support</groupid>
     </grouplist>
   </category>