diff --git a/setups/interim/WindowBuilder.setup b/setups/interim/WindowBuilder.setup
deleted file mode 100644
index 0a7bac487..000000000
--- a/setups/interim/WindowBuilder.setup
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<setup:Project
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
-    xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
-    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
-    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
-    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
-    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
-    name="windowbuilder"
-    label="Window Builder">
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
-    <reference
-        href="WindowBuilderConfiguration.setup#/"/>
-  </annotation>
-  <setupTask
-      xsi:type="setup:EclipseIniTask"
-      option="-Xmx"
-      value="2048m"
-      vm="true">
-    <description>Set the heap space needed to work with the Window Builder projects</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:ResourceCreationTask"
-      excludedTriggers="STARTUP MANUAL"
-      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
-      encoding="UTF-8">
-    <description>Initialize JDT's package explorer to show working sets as its root objects</description>
-    <content>
-      &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>
-      &lt;section name=&quot;Workbench&quot;>
-      	&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>
-      		&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>
-      		&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>
-      		&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>
-      		&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>
-      		&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>
-      	&lt;/section>
-      &lt;/section>
-
-    </content>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:CompoundTask"
-      name="User Preferences">
-    <annotation
-        source="http://www.eclipse.org/oomph/setup/UserPreferences">
-      <detail
-          key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions">
-        <value>record</value>
-      </detail>
-      <detail
-          key="/instance/org.eclipse.oomph.setup.ui/p2.startup.tasks">
-        <value>record</value>
-      </detail>
-    </annotation>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="org.eclipse.oomph.setup.ui">
-      <setupTask
-          xsi:type="setup:PreferenceTask"
-          key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions"
-          value="true"/>
-    </setupTask>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      name="eclipse.target.platform"
-      value="${eclipse.target.platform.latest}"
-      storageURI="scope://Workspace"/>
-  <project name="core"
-      label="Core">
-    <setupTask
-        xsi:type="jdt:JRETask"
-        version="JavaSE-11"
-        location="${jre.location-11}"
-        name="JRE for JavaSE-11">
-      <description>Define the JRE needed to compile and run the Window Builder Java projects</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.p2:P2Task"
-        label="Window Builder Tools">
-      <requirement
-          name="org.eclipse.m2e.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.buildship.feature.group"/>
-      <description>Install the tools needed in the IDE to work with the source code for Window Builder</description>
-    </setupTask>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.windowbuilder"
-        remoteURI="eclipse/windowbuilder">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>The Window Builder Git repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>The Git clone for the Window Builder Projects</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Window Builder">
-        <requirement
-            name="org.eclipse.sdk.feature.group"/>
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${git.clone.windowbuilder.location}"
-            locateNestedProjects="true">
-          <predicate
-              xsi:type="predicates:NotPredicate">
-            <operand
-                xsi:type="predicates:NamePredicate"
-                pattern="org\.eclipse\.windowbuilder"/>
-          </predicate>
-        </sourceLocator>
-        <repositoryList>
-          <repository
-              url="https://download.eclipse.org/releases/${eclipse.target.platform.latest}"/>
-          <repository
-              url="https://download.eclipse.org/cbi/updates/license"/>
-        </repositoryList>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask"
-        id="windowbuilder.workingsets"
-        prefix="org.eclipse.windowbuilder-">
-      <workingSet
-          name="Window Builder Plugins">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.wb.core"/>
-          <operand
-              xsi:type="workingsets:ExclusionPredicate"
-              excludedWorkingSet="//'windowbuilder.workingsets'/@workingSets[name='Window%20Builder%20Features'] //'windowbuilder.workingsets'/@workingSets[name='Window%20Builder%20Releng'] //'windowbuilder.workingsets'/@workingSets[name='Window%20Builder%20Tests']"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Window Builder Tests">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.wb.core"/>
-          <operand
-              xsi:type="predicates:NamePredicate"
-              pattern=".*\.test.*"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Window Builder Features">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.wb.core"/>
-          <operand
-              xsi:type="predicates:NaturePredicate"
-              nature="org.eclipse.pde.FeatureNature"/>
-        </predicate>
-      </workingSet>
-      <workingSet
-          name="Window Builder Releng">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="org.eclipse.wb.core"/>
-          <operand
-              xsi:type="predicates:NamePredicate"
-              pattern="org\.eclipse\.wb\.releng.*"/>
-        </predicate>
-      </workingSet>
-      <description>The dynamic working sets for the Window Builder projects</description>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master">
-      <setupTask
-          xsi:type="setup:EclipseIniTask"
-          option="-Doomph.redirection.windowbuilder"
-          value="=https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/WindowBuilder.setup->${git.clone.windowbuilder.location|uri}/setups/WindowBuilder.setup"
-          vm="true">
-        <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
-      </setupTask>
-    </stream>
-    <description>The tools and runtime for Windows Builder</description>
-  </project>
-  <project name="website"
-      label="Website">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.www.eclipse.org.wb"
-        locationQualifier="www.eclipse.org."
-        remoteURI="www.eclipse.org/windowbuilder">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>Window Builder Website Git or Gerrit repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>The Git repository of the Window Builder website</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.targlets:TargletTask">
-      <targlet
-          name="Window Builder Website">
-        <requirement
-            name="*"/>
-        <sourceLocator
-            rootFolder="${git.clone.www.eclipse.org.wb.location}"
-            locateNestedProjects="true"/>
-      </targlet>
-    </setupTask>
-    <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask"
-        id="windowbuilder.website.workingsets"
-        prefix="org.eclipse.windowbuilder-">
-      <workingSet
-          name="Window Builder Website">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="windowbuilder"/>
-        </predicate>
-      </workingSet>
-      <description>The dynamic working sets for Window Builder website projects</description>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master"/>
-    <description>The Window Builder Eclipse Website</description>
-  </project>
-  <logicalProjectContainer
-      xsi:type="setup:ProjectCatalog"
-      href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
-  <description>Window Builder provides cool stuff.</description>
-</setup:Project>
diff --git a/setups/interim/WindowBuilderConfiguration.setup b/setups/interim/WindowBuilderConfiguration.setup
deleted file mode 100644
index a7d7d28a2..000000000
--- a/setups/interim/WindowBuilderConfiguration.setup
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<setup:Configuration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    label="Eclipse Window Builder">
-  <annotation
-      source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-    <detail
-        key="imageURI">
-      <value>https://www.eclipse.org/downloads/images/committers.png</value>
-    </detail>
-    <detail
-        key="badgeLabel">
-      <value>Window Builder</value>
-    </detail>
-  </annotation>
-  <installation
-      name="windowbuilder.installation"
-      label="Window BuilderInstallation">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="installation.id.default"
-        value="window-builder"/>
-    <productVersion
-        href="index:/org.eclipse.setup#//@productCatalogs[name='org.eclipse.products']/@products[name='epp.package.committers']/@versions[name='latest']"/>
-    <description>The Window Builder installation provides the latest tools needed to work with the Window Builder source code.</description>
-  </installation>
-  <workspace
-      name="windowbuilder.workspace"
-      label="Window Builder Workspace">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="workspace.id.default"
-        value="window-builder-ws"/>
-    <setupTask
-        xsi:type="setup:CompoundTask"
-        name="User Preferences">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/UserPreferences">
-        <detail
-            key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions">
-          <value>record</value>
-        </detail>
-      </annotation>
-      <setupTask
-          xsi:type="setup:CompoundTask"
-          name="org.eclipse.oomph.setup.ui">
-        <setupTask
-            xsi:type="setup:PreferenceTask"
-            key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions"
-            value="true"/>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:CompoundTask"
-          name="org.eclipse.ui.ide">
-        <setupTask
-            xsi:type="setup:PreferenceTask"
-            key="/instance/org.eclipse.ui.ide/WORKSPACE_NAME"
-            value="Window Builder"/>
-      </setupTask>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="eclipse.git.authentication.style"
-        defaultValue="anonymous"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='windowbuilder']/@projects[name='core']/@streams[name='master']"/>
-    <stream
-        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='windowbuilder']/@projects[name='website']/@streams[name='master']"/>
-    <description>The Window Builder workspace provides all the source code of the Eclipse Window Builder project.</description>
-  </workspace>
-  <description>
-    &lt;p>
-    The Window Builder configuration provisions a dedicated development environment for the complete set of &lt;a href=&quot;https://www.eclipse.org/windowbuilder/&quot;>Window Builder&lt;/a> projects.
-    &lt;/p>
-    &lt;p>
-    The installation is based on the latest available release train repository,
-    the workspace consists of projects from over the Window Builder Git clones organized into workings sets,
-    and the PDE target platform, like the installation, is also based on thelatest available release train repository.
-    &lt;p>
-    &lt;/p>
-    Please &lt;a href=&quot;https://wiki.eclipse.org/Eclipse_Platform_SDK_Provisioning&quot;>read the analogous tutorial instructions&lt;/a> for the Eclipse Platform SDK's configuration for more details.
-    &lt;/p>
-  </description>
-</setup:Configuration>