[448673] Addressed review issues
- removed hard coded paths
- removed optional IDE features
diff --git a/releng/org.eclipse.xpand.releng/Xpand.setup b/releng/org.eclipse.xpand.releng/Xpand.setup
index 6d6391f..090d7fe 100644
--- a/releng/org.eclipse.xpand.releng/Xpand.setup
+++ b/releng/org.eclipse.xpand.releng/Xpand.setup
@@ -241,29 +241,12 @@
       name="IDE Tools">
     <setupTask
         xsi:type="setup.p2:P2Task"
-        label="Mac Badge"
-        licenseConfirmationDisabled="true">
-      <requirement
-          name="name.njbartlett.eclipse.macbadge.feature.feature.group"/>
-      <repository
-          url="http://macbadge-updates.s3.amazonaws.com/"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.p2:P2Task"
         label="EclEmma">
       <requirement
           name="com.mountainminds.eclemma.feature.feature.group"/>
       <repository
           url="http://update.eclemma.org/"/>
     </setupTask>
-    <setupTask
-        xsi:type="setup.p2:P2Task"
-        label="AnyEdit etc.">
-      <requirement
-          name="AnyEditTools.feature.group"/>
-      <repository
-          url="http://andrei.gmxhome.de/eclipse/"/>
-    </setupTask>
   </setupTask>
   <setupTask
       xsi:type="setup:CompoundTask"
@@ -280,18 +263,6 @@
         xsi:type="setup:CompoundTask"
         name="org.eclipse.jdt.core">
       <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_LIB"
-          value="/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/jre/lib/rt.jar"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_SRC"
-          value="/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/src.zip"/>
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_SRCROOT"
-          value="src"/>
-      <setupTask
           xsi:type="setup:CompoundTask"
           name="org.eclipse.jdt.core.formatter">
         <setupTask
@@ -1628,14 +1599,6 @@
     </setupTask>
     <setupTask
         xsi:type="setup:CompoundTask"
-        name="name.njbartlett.eclipse">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/name.njbartlett.eclipse.macbadge/name"
-          value="Xpand"/>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:CompoundTask"
         name="org.eclipse.mylyn.team.ui">
       <setupTask
           xsi:type="setup:PreferenceTask"