diff --git a/prepopulate.json b/prepopulate.json
index 8c5900d..672fd09 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -414,16 +414,6 @@
       "cjose": [
         "cjose.aarch64"
       ],
-      "clang": [
-        "clang-analyzer.noarch",
-        "clang-devel.aarch64",
-        "clang-libs.aarch64",
-        "clang-resource-filesystem.aarch64",
-        "clang-tools-extra.aarch64",
-        "clang.aarch64",
-        "git-clang-format.aarch64",
-        "python3-clang.aarch64"
-      ],
       "cldr-emoji-annotation": [
         "cldr-emoji-annotation-dtd.noarch",
         "cldr-emoji-annotation.noarch"
@@ -479,9 +469,6 @@
       "colord-gtk": [
         "colord-gtk.aarch64"
       ],
-      "compiler-rt": [
-        "compiler-rt.aarch64"
-      ],
       "conmon": [
         "conmon.aarch64"
       ],
@@ -2990,10 +2977,6 @@
       "libogg": [
         "libogg.aarch64"
       ],
-      "libomp": [
-        "libomp-devel.aarch64",
-        "libomp.aarch64"
-      ],
       "libopenraw": [
         "libopenraw.aarch64"
       ],
@@ -3265,16 +3248,6 @@
         "lksctp-tools-devel.aarch64",
         "lksctp-tools-doc.aarch64"
       ],
-      "lld": [
-        "lld-devel.aarch64",
-        "lld-libs.aarch64",
-        "lld.aarch64"
-      ],
-      "lldb": [
-        "lldb-devel.aarch64",
-        "lldb.aarch64",
-        "python3-lldb.aarch64"
-      ],
       "lldpd": [
         "lldpd.aarch64"
       ],
@@ -3282,6 +3255,21 @@
         "llhttp.aarch64"
       ],
       "llvm": [
+        "clang-analyzer.noarch",
+        "clang-devel.aarch64",
+        "clang-libs.aarch64",
+        "clang-resource-filesystem.aarch64",
+        "clang-tools-extra.aarch64",
+        "clang.aarch64",
+        "compiler-rt.aarch64",
+        "git-clang-format.aarch64",
+        "libomp-devel.aarch64",
+        "libomp.aarch64",
+        "lld-devel.aarch64",
+        "lld-libs.aarch64",
+        "lld.aarch64",
+        "lldb-devel.aarch64",
+        "lldb.aarch64",
         "llvm-devel.aarch64",
         "llvm-doc.noarch",
         "llvm-googletest.aarch64",
@@ -3289,7 +3277,10 @@
         "llvm-static.aarch64",
         "llvm-test.aarch64",
         "llvm-toolset.aarch64",
-        "llvm.aarch64"
+        "llvm.aarch64",
+        "python3-clang.aarch64",
+        "python3-lit.noarch",
+        "python3-lldb.aarch64"
       ],
       "lm_sensors": [
         "lm_sensors-devel.aarch64",
@@ -4952,9 +4943,6 @@
       "python-libevdev": [
         "python3-libevdev.noarch"
       ],
-      "python-lit": [
-        "python3-lit.noarch"
-      ],
       "python-lxml": [
         "python3-lxml.aarch64"
       ],
@@ -6940,16 +6928,6 @@
       "cjose": [
         "cjose.ppc64le"
       ],
-      "clang": [
-        "clang-analyzer.noarch",
-        "clang-devel.ppc64le",
-        "clang-libs.ppc64le",
-        "clang-resource-filesystem.ppc64le",
-        "clang-tools-extra.ppc64le",
-        "clang.ppc64le",
-        "git-clang-format.ppc64le",
-        "python3-clang.ppc64le"
-      ],
       "cldr-emoji-annotation": [
         "cldr-emoji-annotation-dtd.noarch",
         "cldr-emoji-annotation.noarch"
@@ -6999,9 +6977,6 @@
       "colord-gtk": [
         "colord-gtk.ppc64le"
       ],
-      "compiler-rt": [
-        "compiler-rt.ppc64le"
-      ],
       "conmon": [
         "conmon.ppc64le"
       ],
@@ -9476,10 +9451,6 @@
       "libogg": [
         "libogg.ppc64le"
       ],
-      "libomp": [
-        "libomp-devel.ppc64le",
-        "libomp.ppc64le"
-      ],
       "libopenraw": [
         "libopenraw.ppc64le"
       ],
@@ -9740,16 +9711,6 @@
         "lksctp-tools-devel.ppc64le",
         "lksctp-tools-doc.ppc64le"
       ],
-      "lld": [
-        "lld-devel.ppc64le",
-        "lld-libs.ppc64le",
-        "lld.ppc64le"
-      ],
-      "lldb": [
-        "lldb-devel.ppc64le",
-        "lldb.ppc64le",
-        "python3-lldb.ppc64le"
-      ],
       "lldpd": [
         "lldpd.ppc64le"
       ],
@@ -9757,6 +9718,21 @@
         "llhttp.ppc64le"
       ],
       "llvm": [
+        "clang-analyzer.noarch",
+        "clang-devel.ppc64le",
+        "clang-libs.ppc64le",
+        "clang-resource-filesystem.ppc64le",
+        "clang-tools-extra.ppc64le",
+        "clang.ppc64le",
+        "compiler-rt.ppc64le",
+        "git-clang-format.ppc64le",
+        "libomp-devel.ppc64le",
+        "libomp.ppc64le",
+        "lld-devel.ppc64le",
+        "lld-libs.ppc64le",
+        "lld.ppc64le",
+        "lldb-devel.ppc64le",
+        "lldb.ppc64le",
         "llvm-devel.ppc64le",
         "llvm-doc.noarch",
         "llvm-googletest.ppc64le",
@@ -9764,7 +9740,10 @@
         "llvm-static.ppc64le",
         "llvm-test.ppc64le",
         "llvm-toolset.ppc64le",
-        "llvm.ppc64le"
+        "llvm.ppc64le",
+        "python3-clang.ppc64le",
+        "python3-lit.noarch",
+        "python3-lldb.ppc64le"
       ],
       "lm_sensors": [
         "lm_sensors-libs.ppc64le",
@@ -11428,9 +11407,6 @@
       "python-libevdev": [
         "python3-libevdev.noarch"
       ],
-      "python-lit": [
-        "python3-lit.noarch"
-      ],
       "python-lxml": [
         "python3-lxml.ppc64le"
       ],
@@ -13373,16 +13349,6 @@
       "cjose": [
         "cjose.s390x"
       ],
-      "clang": [
-        "clang-analyzer.noarch",
-        "clang-devel.s390x",
-        "clang-libs.s390x",
-        "clang-resource-filesystem.s390x",
-        "clang-tools-extra.s390x",
-        "clang.s390x",
-        "git-clang-format.s390x",
-        "python3-clang.s390x"
-      ],
       "cldr-emoji-annotation": [
         "cldr-emoji-annotation-dtd.noarch",
         "cldr-emoji-annotation.noarch"
@@ -13435,9 +13401,6 @@
       "colord-gtk": [
         "colord-gtk.s390x"
       ],
-      "compiler-rt": [
-        "compiler-rt.s390x"
-      ],
       "conmon": [
         "conmon.s390x"
       ],
@@ -16161,6 +16124,19 @@
         "llhttp.s390x"
       ],
       "llvm": [
+        "clang-analyzer.noarch",
+        "clang-devel.s390x",
+        "clang-libs.s390x",
+        "clang-resource-filesystem.s390x",
+        "clang-tools-extra.s390x",
+        "clang.s390x",
+        "compiler-rt.s390x",
+        "git-clang-format.s390x",
+        "lld-devel.s390x",
+        "lld-libs.s390x",
+        "lld.s390x",
+        "lldb-devel.s390x",
+        "lldb.s390x",
         "llvm-devel.s390x",
         "llvm-doc.noarch",
         "llvm-googletest.s390x",
@@ -16168,7 +16144,10 @@
         "llvm-static.s390x",
         "llvm-test.s390x",
         "llvm-toolset.s390x",
-        "llvm.s390x"
+        "llvm.s390x",
+        "python3-clang.s390x",
+        "python3-lit.noarch",
+        "python3-lldb.s390x"
       ],
       "lm_sensors": [
         "lm_sensors-libs.s390x",
@@ -17806,9 +17785,6 @@
       "python-libevdev": [
         "python3-libevdev.noarch"
       ],
-      "python-lit": [
-        "python3-lit.noarch"
-      ],
       "python-lxml": [
         "python3-lxml.s390x"
       ],
@@ -19801,16 +19777,6 @@
       "cjose": [
         "cjose.x86_64"
       ],
-      "clang": [
-        "clang-analyzer.noarch",
-        "clang-devel.x86_64",
-        "clang-libs.x86_64",
-        "clang-resource-filesystem.x86_64",
-        "clang-tools-extra.x86_64",
-        "clang.x86_64",
-        "git-clang-format.x86_64",
-        "python3-clang.x86_64"
-      ],
       "cldr-emoji-annotation": [
         "cldr-emoji-annotation-dtd.noarch",
         "cldr-emoji-annotation.noarch"
@@ -19866,9 +19832,6 @@
       "colord-gtk": [
         "colord-gtk.x86_64"
       ],
-      "compiler-rt": [
-        "compiler-rt.x86_64"
-      ],
       "conmon": [
         "conmon.x86_64"
       ],
@@ -22410,10 +22373,6 @@
       "libogg": [
         "libogg.x86_64"
       ],
-      "libomp": [
-        "libomp-devel.x86_64",
-        "libomp.x86_64"
-      ],
       "libopenraw": [
         "libopenraw.x86_64"
       ],
@@ -22693,16 +22652,6 @@
         "lksctp-tools-devel.x86_64",
         "lksctp-tools-doc.x86_64"
       ],
-      "lld": [
-        "lld-devel.x86_64",
-        "lld-libs.x86_64",
-        "lld.x86_64"
-      ],
-      "lldb": [
-        "lldb-devel.x86_64",
-        "lldb.x86_64",
-        "python3-lldb.x86_64"
-      ],
       "lldpd": [
         "lldpd.x86_64"
       ],
@@ -22710,6 +22659,21 @@
         "llhttp.x86_64"
       ],
       "llvm": [
+        "clang-analyzer.noarch",
+        "clang-devel.x86_64",
+        "clang-libs.x86_64",
+        "clang-resource-filesystem.x86_64",
+        "clang-tools-extra.x86_64",
+        "clang.x86_64",
+        "compiler-rt.x86_64",
+        "git-clang-format.x86_64",
+        "libomp-devel.x86_64",
+        "libomp.x86_64",
+        "lld-devel.x86_64",
+        "lld-libs.x86_64",
+        "lld.x86_64",
+        "lldb-devel.x86_64",
+        "lldb.x86_64",
         "llvm-devel.x86_64",
         "llvm-doc.noarch",
         "llvm-googletest.x86_64",
@@ -24399,9 +24363,6 @@
       "python-libevdev": [
         "python3-libevdev.noarch"
       ],
-      "python-lit": [
-        "python3-lit.noarch"
-      ],
       "python-lxml": [
         "python3-lxml.x86_64"
       ],
diff --git a/prepopulate.yaml b/prepopulate.yaml
index d4af0ea..e40f5bc 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -320,15 +320,6 @@ AppStream:
     - cim-schema.noarch
     cjose:
     - cjose.aarch64
-    clang:
-    - clang-analyzer.noarch
-    - clang-devel.aarch64
-    - clang-libs.aarch64
-    - clang-resource-filesystem.aarch64
-    - clang-tools-extra.aarch64
-    - clang.aarch64
-    - git-clang-format.aarch64
-    - python3-clang.aarch64
     cldr-emoji-annotation:
     - cldr-emoji-annotation-dtd.noarch
     - cldr-emoji-annotation.noarch
@@ -370,8 +361,6 @@ AppStream:
     - colord.aarch64
     colord-gtk:
     - colord-gtk.aarch64
-    compiler-rt:
-    - compiler-rt.aarch64
     conmon:
     - conmon.aarch64
     conntrack-tools:
@@ -2326,9 +2315,6 @@ AppStream:
     - libnsl2.aarch64
     libogg:
     - libogg.aarch64
-    libomp:
-    - libomp-devel.aarch64
-    - libomp.aarch64
     libopenraw:
     - libopenraw.aarch64
     libosinfo:
@@ -2529,19 +2515,26 @@ AppStream:
     lksctp-tools:
     - lksctp-tools-devel.aarch64
     - lksctp-tools-doc.aarch64
-    lld:
-    - lld-devel.aarch64
-    - lld-libs.aarch64
-    - lld.aarch64
-    lldb:
-    - lldb-devel.aarch64
-    - lldb.aarch64
-    - python3-lldb.aarch64
     lldpd:
     - lldpd.aarch64
     llhttp:
     - llhttp.aarch64
     llvm:
+    - clang-analyzer.noarch
+    - clang-devel.aarch64
+    - clang-libs.aarch64
+    - clang-resource-filesystem.aarch64
+    - clang-tools-extra.aarch64
+    - clang.aarch64
+    - compiler-rt.aarch64
+    - git-clang-format.aarch64
+    - libomp-devel.aarch64
+    - libomp.aarch64
+    - lld-devel.aarch64
+    - lld-libs.aarch64
+    - lld.aarch64
+    - lldb-devel.aarch64
+    - lldb.aarch64
     - llvm-devel.aarch64
     - llvm-doc.noarch
     - llvm-googletest.aarch64
@@ -2550,6 +2543,9 @@ AppStream:
     - llvm-test.aarch64
     - llvm-toolset.aarch64
     - llvm.aarch64
+    - python3-clang.aarch64
+    - python3-lit.noarch
+    - python3-lldb.aarch64
     lm_sensors:
     - lm_sensors-devel.aarch64
     - lm_sensors-libs.aarch64
@@ -3798,8 +3794,6 @@ AppStream:
     - python3-ldap.aarch64
     python-libevdev:
     - python3-libevdev.noarch
-    python-lit:
-    - python3-lit.noarch
     python-lxml:
     - python3-lxml.aarch64
     python-mako:
@@ -5390,15 +5384,6 @@ AppStream:
     - cim-schema.noarch
     cjose:
     - cjose.ppc64le
-    clang:
-    - clang-analyzer.noarch
-    - clang-devel.ppc64le
-    - clang-libs.ppc64le
-    - clang-resource-filesystem.ppc64le
-    - clang-tools-extra.ppc64le
-    - clang.ppc64le
-    - git-clang-format.ppc64le
-    - python3-clang.ppc64le
     cldr-emoji-annotation:
     - cldr-emoji-annotation-dtd.noarch
     - cldr-emoji-annotation.noarch
@@ -5436,8 +5421,6 @@ AppStream:
     - colord.ppc64le
     colord-gtk:
     - colord-gtk.ppc64le
-    compiler-rt:
-    - compiler-rt.ppc64le
     conmon:
     - conmon.ppc64le
     conntrack-tools:
@@ -7363,9 +7346,6 @@ AppStream:
     - libocxl.ppc64le
     libogg:
     - libogg.ppc64le
-    libomp:
-    - libomp-devel.ppc64le
-    - libomp.ppc64le
     libopenraw:
     - libopenraw.ppc64le
     libosinfo:
@@ -7558,19 +7538,26 @@ AppStream:
     lksctp-tools:
     - lksctp-tools-devel.ppc64le
     - lksctp-tools-doc.ppc64le
-    lld:
-    - lld-devel.ppc64le
-    - lld-libs.ppc64le
-    - lld.ppc64le
-    lldb:
-    - lldb-devel.ppc64le
-    - lldb.ppc64le
-    - python3-lldb.ppc64le
     lldpd:
     - lldpd.ppc64le
     llhttp:
     - llhttp.ppc64le
     llvm:
+    - clang-analyzer.noarch
+    - clang-devel.ppc64le
+    - clang-libs.ppc64le
+    - clang-resource-filesystem.ppc64le
+    - clang-tools-extra.ppc64le
+    - clang.ppc64le
+    - compiler-rt.ppc64le
+    - git-clang-format.ppc64le
+    - libomp-devel.ppc64le
+    - libomp.ppc64le
+    - lld-devel.ppc64le
+    - lld-libs.ppc64le
+    - lld.ppc64le
+    - lldb-devel.ppc64le
+    - lldb.ppc64le
     - llvm-devel.ppc64le
     - llvm-doc.noarch
     - llvm-googletest.ppc64le
@@ -7579,6 +7566,9 @@ AppStream:
     - llvm-test.ppc64le
     - llvm-toolset.ppc64le
     - llvm.ppc64le
+    - python3-clang.ppc64le
+    - python3-lit.noarch
+    - python3-lldb.ppc64le
     lm_sensors:
     - lm_sensors-libs.ppc64le
     - lm_sensors-sensord.ppc64le
@@ -8827,8 +8817,6 @@ AppStream:
     - python3-ldap.ppc64le
     python-libevdev:
     - python3-libevdev.noarch
-    python-lit:
-    - python3-lit.noarch
     python-lxml:
     - python3-lxml.ppc64le
     python-mako:
@@ -10383,15 +10371,6 @@ AppStream:
     - cim-schema.noarch
     cjose:
     - cjose.s390x
-    clang:
-    - clang-analyzer.noarch
-    - clang-devel.s390x
-    - clang-libs.s390x
-    - clang-resource-filesystem.s390x
-    - clang-tools-extra.s390x
-    - clang.s390x
-    - git-clang-format.s390x
-    - python3-clang.s390x
     cldr-emoji-annotation:
     - cldr-emoji-annotation-dtd.noarch
     - cldr-emoji-annotation.noarch
@@ -10431,8 +10410,6 @@ AppStream:
     - colord.s390x
     colord-gtk:
     - colord-gtk.s390x
-    compiler-rt:
-    - compiler-rt.s390x
     conmon:
     - conmon.s390x
     conntrack-tools:
@@ -12545,6 +12522,19 @@ AppStream:
     llhttp:
     - llhttp.s390x
     llvm:
+    - clang-analyzer.noarch
+    - clang-devel.s390x
+    - clang-libs.s390x
+    - clang-resource-filesystem.s390x
+    - clang-tools-extra.s390x
+    - clang.s390x
+    - compiler-rt.s390x
+    - git-clang-format.s390x
+    - lld-devel.s390x
+    - lld-libs.s390x
+    - lld.s390x
+    - lldb-devel.s390x
+    - lldb.s390x
     - llvm-devel.s390x
     - llvm-doc.noarch
     - llvm-googletest.s390x
@@ -12553,6 +12543,9 @@ AppStream:
     - llvm-test.s390x
     - llvm-toolset.s390x
     - llvm.s390x
+    - python3-clang.s390x
+    - python3-lit.noarch
+    - python3-lldb.s390x
     lm_sensors:
     - lm_sensors-libs.s390x
     - lm_sensors-sensord.s390x
@@ -13781,8 +13774,6 @@ AppStream:
     - python3-ldap.s390x
     python-libevdev:
     - python3-libevdev.noarch
-    python-lit:
-    - python3-lit.noarch
     python-lxml:
     - python3-lxml.s390x
     python-mako:
@@ -15380,15 +15371,6 @@ AppStream:
     - cim-schema.noarch
     cjose:
     - cjose.x86_64
-    clang:
-    - clang-analyzer.noarch
-    - clang-devel.x86_64
-    - clang-libs.x86_64
-    - clang-resource-filesystem.x86_64
-    - clang-tools-extra.x86_64
-    - clang.x86_64
-    - git-clang-format.x86_64
-    - python3-clang.x86_64
     cldr-emoji-annotation:
     - cldr-emoji-annotation-dtd.noarch
     - cldr-emoji-annotation.noarch
@@ -15430,8 +15412,6 @@ AppStream:
     - colord.x86_64
     colord-gtk:
     - colord-gtk.x86_64
-    compiler-rt:
-    - compiler-rt.x86_64
     conmon:
     - conmon.x86_64
     conntrack-tools:
@@ -17412,9 +17392,6 @@ AppStream:
     - libnsl2.x86_64
     libogg:
     - libogg.x86_64
-    libomp:
-    - libomp-devel.x86_64
-    - libomp.x86_64
     libopenraw:
     - libopenraw.x86_64
     libosinfo:
@@ -17621,19 +17598,26 @@ AppStream:
     lksctp-tools:
     - lksctp-tools-devel.x86_64
     - lksctp-tools-doc.x86_64
-    lld:
-    - lld-devel.x86_64
-    - lld-libs.x86_64
-    - lld.x86_64
-    lldb:
-    - lldb-devel.x86_64
-    - lldb.x86_64
-    - python3-lldb.x86_64
     lldpd:
     - lldpd.x86_64
     llhttp:
     - llhttp.x86_64
     llvm:
+    - clang-analyzer.noarch
+    - clang-devel.x86_64
+    - clang-libs.x86_64
+    - clang-resource-filesystem.x86_64
+    - clang-tools-extra.x86_64
+    - clang.x86_64
+    - compiler-rt.x86_64
+    - git-clang-format.x86_64
+    - libomp-devel.x86_64
+    - libomp.x86_64
+    - lld-devel.x86_64
+    - lld-libs.x86_64
+    - lld.x86_64
+    - lldb-devel.x86_64
+    - lldb.x86_64
     - llvm-devel.x86_64
     - llvm-doc.noarch
     - llvm-googletest.x86_64
@@ -18905,8 +18889,6 @@ AppStream:
     - python3-ldap.x86_64
     python-libevdev:
     - python3-libevdev.noarch
-    python-lit:
-    - python3-lit.noarch
     python-lxml:
     - python3-lxml.x86_64
     python-mako:
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index ac1b390..06e8160 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -389,9 +389,6 @@ additional_packages = [
             "389-ds-base-snmp", #ENGCMP-4038
             "ruby-bundled-gems", #ENGCMP-4039
             "python3-pam", #ENGCMP-3942
-            "lld", #ENGCMP-3955
-            "lld-devel", #ENGCMP-3955
-            "lld-libs", #ENGCMP-3955
             "gnome-ponytail-daemon", #ENGCMP-4052
             "python3-gnome-ponytail-daemon", #ENGCMP-4052
             "wireguard-tools", #ENGCMP-4057