diff --git a/comps.xml b/comps.xml
index 765fc85..4e16365 100644
--- a/comps.xml
+++ b/comps.xml
@@ -14248,109 +14248,6 @@
       <packagereq variant="NFV" type="default">kernel-rt-debug-modules-extra</packagereq>
     </packagelist>
   </group>
-  <group variant="SAP">
-    <id>sap</id>
-    <name>SAP</name>
-    <name xml:lang="as">SAP</name>
-    <name xml:lang="bn">SAP</name>
-    <name xml:lang="cs">SAP</name>
-    <name xml:lang="de">SAP</name>
-    <name xml:lang="de_CH">SAP</name>
-    <name xml:lang="es">SAP</name>
-    <name xml:lang="eu">SAP</name>
-    <name xml:lang="fr">SAP</name>
-    <name xml:lang="gu">SAP</name>
-    <name xml:lang="hi">SAP</name>
-    <name xml:lang="it">SAP</name>
-    <name xml:lang="ja">SAP</name>
-    <name xml:lang="kn">SAP</name>
-    <name xml:lang="ko">SAP</name>
-    <name xml:lang="ml">എസ്എപി</name>
-    <name xml:lang="mr">SAP</name>
-    <name xml:lang="or">SAP</name>
-    <name xml:lang="pa">SAP</name>
-    <name xml:lang="pl">SAP</name>
-    <name xml:lang="pt_BR">SAP</name>
-    <name xml:lang="ru">SAP</name>
-    <name xml:lang="ta">SAP</name>
-    <name xml:lang="te">SAP</name>
-    <name xml:lang="uk">SAP</name>
-    <name xml:lang="zh">SAP</name>
-    <name xml:lang="zh_CN">SAP</name>
-    <name xml:lang="zh_TW">SAP</name>
-    <description>MSVSphere for SAP packages.</description>
-    <description xml:lang="cs">Balíčky MSVSphere pro systém SAP.</description>
-    <description xml:lang="de">MSVSphere für SAP-Pakete.</description>
-    <description xml:lang="de_CH">MSVSphere für SAP-Pakete.</description>
-    <description xml:lang="es">Paquetes SAP para MSVSphere.</description>
-    <description xml:lang="fr">MSVSphere pour packages SAP.</description>
-    <description xml:lang="gu">SAP પેકેજો માટે MSVSphere.</description>
-    <description xml:lang="hi">SAP संकुल के लिए MSVSphere.</description>
-    <description xml:lang="it">MSVSphere per pacchetti SAP</description>
-    <description xml:lang="ja">SAP パッケージ用の MSVSphere です。</description>
-    <description xml:lang="kn">SAP ಪ್ಯಾಕೇಜುಗಳಿಗಾಗಿ MSVSphere.</description>
-    <description xml:lang="ko">SAP 패키지 용 MSVSphere.</description>
-    <description xml:lang="ml">എസ്എപി പാക്കേജുകള്‍ക്കുള്ള MSVSphere.</description>
-    <description xml:lang="mr">SAP संकुलांकरिता MSVSphere.</description>
-    <description xml:lang="or">SAP ପ୍ୟାକେଜଗୁଡ଼ିକ ପାଇଁ MSVSphere।</description>
-    <description xml:lang="pa">SAP ਪੰਡਾਂ/ਪੈਕੇਜਾਂ ਲਈ MSVSphere।</description>
-    <description xml:lang="pl">Pakiety systemu MSVSphere dla SAP.</description>
-    <description xml:lang="pt_BR">MSVSphere para pacotes SAP.</description>
-    <description xml:lang="ru">Пакеты МСВСфера для SAP.</description>
-    <description xml:lang="ta">SAP தொகுப்புகளுக்கான MSVSphere.</description>
-    <description xml:lang="te">SAP ప్యాకేజీల కొరకు MSVSphere.</description>
-    <description xml:lang="uk">MSVSphere для пакунків SAP</description>
-    <description xml:lang="zh">MSVSphere for SAP 套件。</description>
-    <description xml:lang="zh_CN">使用 SAP 软件包的 MSVSphere。</description>
-    <description xml:lang="zh_TW">MSVSphere for SAP 套件。</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="SAP" type="default">sap-cluster-connector</packagereq>
-      <packagereq variant="SAP" type="optional">compat-locales-sap</packagereq>
-      <packagereq variant="SAP" type="optional">compat-sap-c++-10</packagereq>
-      <packagereq variant="SAP" type="optional">compat-sap-c++-11</packagereq>
-      <packagereq variant="SAP" type="optional">compat-sap-c++-12</packagereq>
-      <packagereq variant="SAP" type="optional">compat-sap-c++-9</packagereq>
-      <packagereq variant="SAP" type="optional">resource-agents-sap</packagereq>
-      <packagereq variant="SAP" type="optional">tuned-profiles-sap</packagereq>
-      <packagereq variant="SAP" type="optional">vhostmd</packagereq>
-      <packagereq variant="SAP" type="optional">vm-dump-metrics</packagereq>
-    </packagelist>
-  </group>
-  <group variant="SAPHANA">
-    <id>sap-hana</id>
-    <name>SAP HANA</name>
-    <name xml:lang="fr">SAP HANA</name>
-    <name xml:lang="ja">SAP HANA</name>
-    <name xml:lang="ko">SAP HANA</name>
-    <name xml:lang="zh_CN">SAP HANA</name>
-    <description>MSVSphere for SAP HANA packages.</description>
-    <description xml:lang="de">MSVSphere für SAP HANA-Pakete.</description>
-    <description xml:lang="es">MSVSphere para paquetes SAP HANA.</description>
-    <description xml:lang="fr">MSVSphere pour les packages SAP HANA.</description>
-    <description xml:lang="it">MSVSphere per i pacchetti SAP HANA.</description>
-    <description xml:lang="ja">SAP HANA パッケージ用 MSVSphere です。</description>
-    <description xml:lang="ko">MSVSphere for SAP HANA 패키지.</description>
-    <description xml:lang="pt_BR">MSVSphere para pacotes SAP HANA.</description>
-    <description xml:lang="ru">МСВСфера для пакетов SAP HANA.</description>
-    <description xml:lang="zh_CN">MSVSphere for SAP HANA 软件包。</description>
-    <description xml:lang="zh_TW">MSVSphere for SAP HANA包。</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="SAPHANA" type="default">resource-agents-sap-hana</packagereq>
-      <packagereq variant="SAPHANA" type="default">resource-agents-sap-hana-scaleout</packagereq>
-      <packagereq variant="SAPHANA" type="default">rhel-system-roles-sap</packagereq>
-      <packagereq variant="SAPHANA" type="default">tuned-profiles-sap-hana</packagereq>
-      <packagereq variant="SAPHANA" type="optional">compat-sap-c++-10</packagereq>
-      <packagereq variant="SAPHANA" type="optional">compat-sap-c++-11</packagereq>
-      <packagereq variant="SAPHANA" type="optional">compat-sap-c++-12</packagereq>
-      <packagereq variant="SAPHANA" type="optional">compat-sap-c++-9</packagereq>
-      <packagereq variant="SAPHANA" type="optional">vhostmd</packagereq>
-      <packagereq variant="SAPHANA" type="optional">vm-dump-metrics</packagereq>
-    </packagelist>
-  </group>
   <group variant="BaseOS">
     <id>scientific</id>
     <name>Scientific Support</name>