diff --git a/eclipse.spec b/eclipse.spec
index acd539f..7bef190 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -465,14 +465,12 @@ for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt
   if [ -n "$module" ] ; then
     %pom_disable_module bundles/$b eclipse.platform.swt.binaries
     %pom_xpath_inject "pom:excludes" "<plugin id='$b'/>" eclipse.platform.ui/features/org.eclipse.e4.rcp
-    %pom_xpath_remove "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
   fi
 done
 for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do
   module=$(grep ">bundles/$b<" rt.equinox.framework/pom.xml || :)
   if [ -n "$module" ] ; then
     %pom_disable_module bundles/$b rt.equinox.framework
-    %pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
     %pom_xpath_remove -f "plugin[@id='$b']" rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml
   fi
 done
@@ -482,13 +480,11 @@ for b in `(cd rt.equinox.bundles/bundles && ls -d *{macosx,win32,linux}*) | grep
 done
 for b in `ls eclipse.platform.team/bundles/org.eclipse.core.net/fragments/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{eclipse_arch}$)'` ; do
   %pom_disable_module bundles/org.eclipse.core.net/fragments/$b eclipse.platform.team
-  %pom_xpath_remove "plugin[@id='$b']" eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
 done
 for b in `ls eclipse.platform.resources/bundles/ | grep -P -e 'org.eclipse.core.filesystem\.(?!linux\.%{eclipse_arch}$)'` ; do
   module=$(grep ">bundles/$b<" eclipse.platform.resources/pom.xml || :)
   if [ -n "$module" ] ; then
     %pom_disable_module bundles/$b eclipse.platform.resources
-    %pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
     %pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml
   fi
 done
@@ -507,6 +503,11 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
   %pom_xpath_remove -f "plugin[@os='macosx']" $f
   %pom_xpath_remove -f "plugin[@os='win32']" $f
   %pom_xpath_remove -f "plugin[@ws='win32']" $f
+  for arch in x86 x86_64 arm aarch64 ppc64 ppc64le s390x ; do
+    if [ "$arch" != "%{eclipse_arch}" ] ; then
+      %pom_xpath_remove -f "plugin[@arch='$arch']" $f
+    fi
+  done
 done
 
 # We don't need SWT fragments since we only care for current arch