diff --git a/NewAndNoteworthy/CDT-11.0.md b/NewAndNoteworthy/CDT-11.0.md
index ef5a8540687..2f03c0b22e1 100644
--- a/NewAndNoteworthy/CDT-11.0.md
+++ b/NewAndNoteworthy/CDT-11.0.md
@@ -16,6 +16,7 @@ Various plug-ins and features are no longer part of the CDT release.
 Please see the corresponding issue for more details.
 
 - Qt plug-ins (`org.eclipse.cdt.qt.ui/core/feature`) https://github.com/eclipse-cdt/cdt/issues/123 _Note:_ the `org.eclipse.cdt.testsrunner.qttest` plug-in is still part of CDT.
+- Non-universal Welcome Screen Content has been removed from `org.eclipse.cdt` plug-in. The universal content is in `org.eclipse.cdt.doc.user`. https://github.com/eclipse-cdt/cdt/pull/136
 
 # Debug
 
diff --git a/releng/org.eclipse.cdt/build.properties b/releng/org.eclipse.cdt/build.properties
index bb4cf3bcb66..511ef2eec9a 100644
--- a/releng/org.eclipse.cdt/build.properties
+++ b/releng/org.eclipse.cdt/build.properties
@@ -17,8 +17,6 @@ bin.includes = about.html,\
                about.properties,\
                plugin.properties,\
                plugin.xml,\
-               css/,\
-               intro/,\
                META-INF/,\
                cdt_logo_icon32.png
 src.includes = about.html
diff --git a/releng/org.eclipse.cdt/cheatsheets/HelloWorld.xml b/releng/org.eclipse.cdt/cheatsheets/HelloWorld.xml
deleted file mode 100644
index f9dca6103f5..00000000000
--- a/releng/org.eclipse.cdt/cheatsheets/HelloWorld.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<cheatsheet title="Simple C++ Application">
-
-	<intro 
-		href="/org.eclipse.ui.cheatsheets.doc/tasks/tcheatst.htm">
-		<description>
-Welcome to the Hello, World Java tutorial.
-It will help you build the famous "hello world" application and try it out. You will create a java project, and a java class that will print "hello world" in the console when run.
-Let's get started!
-		</description>
-</intro>
-
-	<item
-		href="/org.eclipse.platform.doc.user/concepts/concepts-4.htm"
-		title="Open the Java Perspective">
-		<action
-			pluginId="org.eclipse.ui.cheatsheets"
-			class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective"
-			param1="org.eclipse.jdt.ui.JavaPerspective"/>
-		<description>
-Select Window-&gt;Open Perspective-&gt;Java in the menubar at the top of the workbench.
-This step changes the perspective to set up the Eclipse workbench for Java development.
-You can click the "Click to Perform" button to have the "Java" perspective opened automatically.
-		</description>
-</item>
-
-	<item
-		href="/org.eclipse.jdt.doc.user/tasks/tasks-12.htm"
-		title="Create a java project"
-		skip="true">
-		<action
-			pluginId="org.eclipse.jdt.ui"
-			class="org.eclipse.jdt.internal.ui.wizards.OpenProjectWizardAction"/>
-		<description>
-The first thing you will need is a Java Project.
-If you already have a java project in your workspace that you would like to use, you may skip this step by pressing the "skip" button.  If not, you may press the "click to perform" button to spawn the New Java Project wizard.
-		</description>
-</item>
-
-	<item
-		href="/org.eclipse.jdt.doc.user/gettingStarted/qs-9.htm" 
-		title="Create your HelloWorld class">
-		<action
-			pluginId="org.eclipse.jdt.ui"
-			class="org.eclipse.jdt.internal.ui.wizards.OpenClassWizardAction"/>
-		<description>
-You should now have a Java Project in your workspace.
-The next step in building your hello world application is to create your HelloWorld class.  You may do this by either pressing the "click to perform" button below to launch the New Java Class wizard, or you may use the Eclipse tools to do it, by using the File-&gt;New-&gt;Class action.  
-When you use the wizard, make sure that you specify that you would like to have a "main" method added. Name your class "HelloWorld".  If you use the button below it will be pre-filled for you. 
-If you do not use the "click to perform" button below, press the "click when done" button to advance to the next step in building your hello world app.
-		</description>
-</item>
-
-	<item
-		href="/org.eclipse.jdt.doc.user/tasks/tasks-54.htm"
-		title="Add a System.out.println line in your main method">
-		<description>
-Now that you have your HelloWorld class,
-In the "public static void main" method, add the following statement:  System.out.println("Hello world!"); and save your changes.  Press the "click when done" button below when finished.
-		</description>
-</item>
-
-	<item
-		href="/org.eclipse.jdt.doc.user/gettingStarted/qs-12.htm"
-		title="Test your application">
-		<description>
-The final moment has arrived!  You are ready to test your HelloWorld class.
-Select your class in the package explorer (the java tree view on the left of the workbench window in the Java Perspective.).  When your HelloWorld class is selected, press the down arrow beside the running man icon in the toolbar and select Run As-&gt;application.  Hello world! should be printed in your "Console" view.  
-Congratulations!  You have built your hello world application and it worked!
-		</description>
-</item>
-
-</cheatsheet>
diff --git a/releng/org.eclipse.cdt/css/graphics/obj_48/capp_obj.gif b/releng/org.eclipse.cdt/css/graphics/obj_48/capp_obj.gif
deleted file mode 100644
index 96548a7d809..00000000000
Binary files a/releng/org.eclipse.cdt/css/graphics/obj_48/capp_obj.gif and /dev/null differ
diff --git a/releng/org.eclipse.cdt/css/graphics/obj_48/capphov_obj.gif b/releng/org.eclipse.cdt/css/graphics/obj_48/capphov_obj.gif
deleted file mode 100644
index fb48a2b92c1..00000000000
Binary files a/releng/org.eclipse.cdt/css/graphics/obj_48/capphov_obj.gif and /dev/null differ
diff --git a/releng/org.eclipse.cdt/css/graphics/obj_48/cdt_logo_icon.png b/releng/org.eclipse.cdt/css/graphics/obj_48/cdt_logo_icon.png
deleted file mode 100644
index 43b57b50187..00000000000
Binary files a/releng/org.eclipse.cdt/css/graphics/obj_48/cdt_logo_icon.png and /dev/null differ
diff --git a/releng/org.eclipse.cdt/css/graphics/obj_48/cdtdev_obj.gif b/releng/org.eclipse.cdt/css/graphics/obj_48/cdtdev_obj.gif
deleted file mode 100644
index 849b16e09e8..00000000000
Binary files a/releng/org.eclipse.cdt/css/graphics/obj_48/cdtdev_obj.gif and /dev/null differ
diff --git a/releng/org.eclipse.cdt/css/graphics/obj_48/cdtdevhov_obj.gif b/releng/org.eclipse.cdt/css/graphics/obj_48/cdtdevhov_obj.gif
deleted file mode 100644
index 6fa89bfa4fb..00000000000
Binary files a/releng/org.eclipse.cdt/css/graphics/obj_48/cdtdevhov_obj.gif and /dev/null differ
diff --git a/releng/org.eclipse.cdt/css/overview.css b/releng/org.eclipse.cdt/css/overview.css
deleted file mode 100644
index d1f6b7680b0..00000000000
--- a/releng/org.eclipse.cdt/css/overview.css
+++ /dev/null
@@ -1,9 +0,0 @@
-a#cdt img { background-image : url(graphics/obj_48/cdt_logo_icon.png); }
-a#cdt:hover img { background-image : url(graphics/obj_48/cdt_logo_icon.png); }
-
-a#hello-world-cdt img { background-image : url(graphics/obj_48/cdt_logo_icon.png); }
-a#hello-world-cdt:hover img { background-image : url(graphics/obj_48/cdt_logo_icon.png); }
-
-body {
-	background-image : url(../../org.eclipse.platform/css/graphics/contentpage/overview_wtr.jpg);
-}
diff --git a/releng/org.eclipse.cdt/css/swt.properties b/releng/org.eclipse.cdt/css/swt.properties
deleted file mode 100644
index 6b6a075b2e8..00000000000
--- a/releng/org.eclipse.cdt/css/swt.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-overview.page-content.overview-links.cdt.link-icon = css/graphics/obj_48/cdtdev_obj.gif
-
-tutorials.page-content.cdt.layout.ncolumns = 2
-tutorials.page-content.cdt.hello-world.link-icon = css/graphics/obj_48/cdtdev_obj.gif
-
-overview.subtitle-id = overview/page-content/page-title
-overview.description-id = overview/page-content/page-description
diff --git a/releng/org.eclipse.cdt/intro/overviewExtensionContent.xml b/releng/org.eclipse.cdt/intro/overviewExtensionContent.xml
deleted file mode 100644
index eb8347b7861..00000000000
--- a/releng/org.eclipse.cdt/intro/overviewExtensionContent.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<introContent>
-  <!-- Extension to the SDK Overview Page. -->
-  <extensionContent alt-style="css/swt.properties" style="css/overview.css" path="overview/page-content/overview-links/endAnchor">
-<!--
-       <link label="CDT Overview" url="http://org.eclipse.ui.intro/showPage?id=cdtoverview" id="cdt">
-          <text>Find out what CDT is all about</text>
-        </link>
--->
-        <link label="C/C++ Online Docs" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm" id="cdt">
-      		<text>Open the online documentation for the CDT</text>
-    	  </link>   
-   </extensionContent>     
-<!--
-  <page alt-style="css/swt.properties" style="css/overview.css" id="cdtoverview" style-id="page">
-    <title style-id="intro-header">Welcome to CDT 2.0</title>
-    <group id="links-background">
-      <group id="page-links">
-          <link label="C/C++ development" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm" id="cdt">
-      		<text>Get familiar with developing C++ programs using Eclipse</text>
-    	  </link>     
-      </group>
-    </group>
-    <group id="action-links">
-      <link url="http://org.eclipse.ui.intro/close" label="Workbench" id="workbench">
-        <text>Go to the workbench</text>
-      </link>
-    </group> 
-  </page>
--->
-</introContent>
diff --git a/releng/org.eclipse.cdt/intro/samplesExtensionContent.xml b/releng/org.eclipse.cdt/intro/samplesExtensionContent.xml
deleted file mode 100644
index 2efd1621095..00000000000
--- a/releng/org.eclipse.cdt/intro/samplesExtensionContent.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<introContent>
-  <!-- Extension to the SDK Samples Page. -->
-  <extensionContent path="samples/page-content/endAnchor">
-  <!--
-	  <group label="C/C++" id="workbench" style-id="samples-group">
-	    <link label="C/C++ Sample program" url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.pde.ui&amp;class=org.eclipse.pde.ui.internal.samples.ShowSampleAction&amp;id=org.eclipse.sdk.samples.javaeditor" id="java-editor" style-id="sample-link">
-	      <text>Demonstrates standard features available to the CDT</text>
-	    </link>
-	  </group>
-  -->
-  </extensionContent>
-</introContent>
diff --git a/releng/org.eclipse.cdt/intro/tutorialsExtensionContent.xml b/releng/org.eclipse.cdt/intro/tutorialsExtensionContent.xml
deleted file mode 100644
index 5287d5c06ff..00000000000
--- a/releng/org.eclipse.cdt/intro/tutorialsExtensionContent.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<introContent>
-  <!-- Extension to the SDK Tutorials Page. -->
-  <extensionContent alt-style="css/swt.properties" style="css/overview.css" path="tutorials/page-content/endAnchor">
-    <group label="C/C++ Development" id="java" style-id="tutorials-group">
- <!--
-     <link 
-			url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.cdt.helloworld" 
-			label="CheatSheet to Build a simple C/C++ application" 
-			id="hello-world-cdt" 
-			style-id="tutorials-link">
-            <text>Create a small C/C++ program that will print "Hello, World" on the console</text>
-      </link>
-  -->
-      <link 
-			label="CDT Tutorials" 
-			url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.cdt.doc.user/getting_started/cdt_o_tutorial.htm" 
-			id="hello-world-cdt"
-			style-id="tutorials-link">
-		    <text>Go to the online help to see the tutorials</text>
-       </link>
-    </group>
-  </extensionContent>
-</introContent>
diff --git a/releng/org.eclipse.cdt/intro/whatsNewExtensionContent.xml b/releng/org.eclipse.cdt/intro/whatsNewExtensionContent.xml
deleted file mode 100644
index 27ec5aaa64f..00000000000
--- a/releng/org.eclipse.cdt/intro/whatsNewExtensionContent.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<introContent>
-  <!-- Extension to the SDK Overview Page. -->
-  <extensionContent path="news/page-content/endAnchor">
-    <group id="news-links">
-    <link label="C/C++" url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm" id="new-and-noteworthy">
-      <text>What's new with the CDT</text>
-    </link>
-    </group>
-  </extensionContent>
-</introContent>
diff --git a/releng/org.eclipse.cdt/plugin.xml b/releng/org.eclipse.cdt/plugin.xml
index e5a440c0987..c93d40f274f 100644
--- a/releng/org.eclipse.cdt/plugin.xml
+++ b/releng/org.eclipse.cdt/plugin.xml
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-   <extension
-         point="org.eclipse.ui.intro.configExtension">
-      <configExtension
-            configId="org.eclipse.platform.introConfig"
-            content="$nl$/intro/overviewExtensionContent.xml"/>  
-         
-      <configExtension
-            configId="org.eclipse.platform.introConfig"
-            content="$nl$/intro/tutorialsExtensionContent.xml"/>  
-      
-      <configExtension
-            configId="org.eclipse.platform.introConfig"
-            content="$nl$/intro/samplesExtensionContent.xml"/>
-            
-     <configExtension
-            configId="org.eclipse.platform.introConfig"
-            content="$nl$/intro/whatsNewExtensionContent.xml"/>
-
-   </extension>
- 
-  
     <extension
          point="org.eclipse.ui.activities">
       <activity
@@ -103,15 +82,4 @@
        </activity>
     
    </extension>
-   
-   <!--extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-      <cheatsheet
-            name="%cheatsheet.helloworld.name"
-            contentFile="$nl$/cheatsheets/HelloWorld.xml"
-            id="org.eclipse.cdt.helloworld">
-         <description>%cheatsheet.helloworld.desc</description>
-      </cheatsheet>
-    
-   </extension-->
-   
 </plugin>