diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
index ddc0aeb0ed..5cab0a2f9b 100644
--- a/eclipse/spring-boot-project.setup
+++ b/eclipse/spring-boot-project.setup
@@ -90,8 +90,6 @@
         name="org.eclipse.wst.server_adapters.feature.feature.group"/>
     <requirement
         name="org.eclipse.wst.web_ui.feature.feature.group"/>
-    <requirement
-        name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
     <requirement
         name="org.springframework.boot.ide.main.feature.feature.group"/>
     <requirement
@@ -139,7 +137,7 @@
             pattern="spring-boot.*"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.8/@workingSets[name='spring-boot-smoke-tests']"/>
+            excludedWorkingSet="//@setupTasks.8/@workingSets[name='spring-boot-smoke-tests'] //@setupTasks.8/@workingSets[name='spring-boot-starters'] //@setupTasks.8/@workingSets[name='spring-boot-tests'] //@setupTasks.8/@workingSets[name='spring-boot-tools']"/>
       </predicate>
     </workingSet>
     <workingSet