diff --git a/eclipse.yaml b/eclipse.yaml
index 9f4c63c..e71509b 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -55,15 +55,8 @@ data:
                 - eclipse-linuxtools-systemtap
                 - eclipse-linuxtools-vagrant
                 - eclipse-linuxtools-valgrind
-                - eclipse-m2e-apt
-                - eclipse-m2e-buildhelper
                 - eclipse-m2e-core
-                - eclipse-m2e-egit
-                - eclipse-m2e-mavenarchiver
-                - eclipse-m2e-mavendev
-                - eclipse-m2e-tycho
                 - eclipse-m2e-workspace
-                - eclipse-m2e-wtp
                 - eclipse-mpc
                 - eclipse-mylyn
                 - eclipse-mylyn-builds
@@ -102,13 +95,7 @@ data:
                 - eclipse-egit-mylyn
                 - eclipse-jdt
                 - eclipse-jgit
-                - eclipse-m2e-apt
-                - eclipse-m2e-buildhelper
                 - eclipse-m2e-core
-                - eclipse-m2e-egit
-                - eclipse-m2e-mavenarchiver
-                - eclipse-m2e-mavendev
-                - eclipse-m2e-tycho
                 - eclipse-m2e-workspace
                 - eclipse-mpc
                 - eclipse-mylyn-context-java
@@ -176,15 +163,8 @@ data:
             - eclipse-linuxtools-systemtap
             - eclipse-linuxtools-vagrant
             - eclipse-linuxtools-valgrind
-            - eclipse-m2e-apt
-            - eclipse-m2e-buildhelper
             - eclipse-m2e-core
-            - eclipse-m2e-egit
-            - eclipse-m2e-mavenarchiver
-            - eclipse-m2e-mavendev
-            - eclipse-m2e-tycho
             - eclipse-m2e-workspace
-            - eclipse-m2e-wtp
             - eclipse-mpc
             - eclipse-mylyn
             - eclipse-mylyn-builds
@@ -256,8 +236,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of docker-client-java, jgit,
-                         jython, plexus-archiver.
+                    Runtime dependency of docker-client-java, jgit, jython.
             apache-commons-discovery:
                 buildorder: 10
                 ref: eclipse
@@ -359,8 +338,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-egit-github,
-                         eclipse-m2e-egit, eclipse-tm-terminal.
+                    Runtime dependency of eclipse-egit-github, eclipse-tm-terminal.
             eclipse-egit-github:
                 buildorder: 60
                 ref: eclipse
@@ -387,8 +365,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-egit, eclipse-egit-github,
-                         eclipse-m2e-egit.
+                    Runtime dependency of eclipse-egit, eclipse-egit-github.
             eclipse-launchbar:
                 buildorder: 50
                 ref: eclipse
@@ -402,64 +379,19 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-            eclipse-m2e-apt:
-                buildorder: 70
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
-            eclipse-m2e-buildhelper:
-                buildorder: 70
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
             eclipse-m2e-core:
                 buildorder: 60
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-m2e-apt, eclipse-m2e-mavenarchiver,
-                         eclipse-m2e-mavendev, eclipse-m2e-buildhelper, eclipse-m2e-egit,
-                         eclipse-m2e-tycho, eclipse-m2e-wtp, eclipse-testng.
-            eclipse-m2e-egit:
-                buildorder: 70
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
-            eclipse-m2e-mavenarchiver:
-                buildorder: 70
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
-                    Runtime dependency of eclipse-m2e-mavendev, eclipse-m2e-wtp.
-            eclipse-m2e-mavendev:
-                buildorder: 80
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
-            eclipse-m2e-tycho:
-                buildorder: 70
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
+                    Runtime dependency of eclipse-testng.
             eclipse-m2e-workspace:
                 buildorder: 40
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core.
-            eclipse-m2e-wtp:
-                buildorder: 80
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
             eclipse-mpc:
                 buildorder: 90
                 ref: eclipse
@@ -518,8 +450,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-m2e-apt,
-                         eclipse-m2e-core, eclipse-m2e-wtp.
+                    Runtime dependency of eclipse-m2e-core.
             ed25519-java:
                 buildorder: 10
                 ref: eclipse
@@ -834,18 +765,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core, maven-indexer.
-            maven-archiver:
-                buildorder: 30
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of maven-war-plugin.
-            maven-filtering:
-                buildorder: 20
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of maven-war-plugin.
             maven-indexer:
                 buildorder: 50
                 ref: eclipse
@@ -859,24 +778,12 @@ data:
                 rationale: >
                     Runtime dependency of eclipse-m2e-core,
                          maven-archetype.
-            maven-mapping:
-                buildorder: 10
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of maven-war-plugin.
             maven-osgi:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of glassfish-hk2.
-            maven-war-plugin:
-                buildorder: 40
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-m2e-wtp.
             nekohtml:
                 buildorder: 80
                 ref: eclipse
@@ -909,24 +816,12 @@ data:
                 rationale: >
                     Runtime dependency of aether-connector-okhttp,
                          okhttp.
-            plexus-archiver:
-                buildorder: 20
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of maven-archiver, maven-war-plugin.
             plexus-build-api:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-m2e-core, maven-filtering.
-            plexus-io:
-                buildorder: 10
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of plexus-archiver.
+                    Runtime dependency of eclipse-m2e-core.
             plexus-velocity:
                 buildorder: 30
                 ref: eclipse