diff --git a/releng/CDT.setup b/releng/CDT.setup
index c043443007e..c810f1d3ceb 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -310,19 +310,15 @@
               url="https://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
           <repository
               url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
-          <repository
-              url="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1-simrel-2019-12-m3/"/>
           <repository
               url="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.0-2020-03-m1/">
             <annotation>
               <detail
                   key="description">
-                <value>OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0'</value>
+                <value>OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' and We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace.</value>
               </detail>
             </annotation>
           </repository>
-          <repository
-              url="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
           <repository
               url="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/">
             <annotation>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 9bd9c4455c1..c676d8eb6b6 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="69">
+<target name="cdt" sequenceNumber="70">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -48,25 +48,10 @@
 <repository location="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <!-- OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
 <repository location="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.0-2020-03-m1/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<!-- normalize org.eclipse.cdt\releng\org.eclipse.cdt.repo\category.xml to remove .source IUs below -->
-<unit id="org.eclipse.tools.templates.core" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.core.source" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.freemarker" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.freemarker.java11" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.freemarker.source" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.freemarker.java11.source" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.ui" version="0.0.0"/>
-<unit id="org.eclipse.tools.templates.ui.source" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
+<!-- We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace. -->
+	<unit id="org.eclipse.cdt.feature.group" version="9.11.0.202001140305"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
@@ -110,4 +95,4 @@
 -ea</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
-</target>
+</target>
\ No newline at end of file