diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index d2f4c1b7f21..680ac229dab 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -23,99 +23,32 @@
 
 
    <extension-point id="CProject" name="%CProject.name"/>
-
 <!-- =================================================================================== -->
 <!-- Extension Point:(Deprecated, to be removed)                                         -->
 <!-- =================================================================================== -->
-
    <extension-point id="CBuildModel" name="%CBuilder.name"/>
-
 <!-- =================================================================================== -->
 <!-- Extension Point:(Deprecated, to be removed) Default command for the MakeBuilder     -->
 <!-- =================================================================================== -->
-
    <extension-point id="CBuildCommand" name="%CBuildCommand.name"/>
-
 <!-- =================================================================================== -->
 <!-- Extension Point:(work in progress) IConsole, customize a C Build console output     -->
 <!-- =================================================================================== -->
-
    <extension-point id="CBuildConsole" name="%CBuildConsole.name"/>
-
 <!-- =================================================================================== -->
 <!-- Extension Point: IProcessList, returns a list of running processes                  -->
 <!-- =================================================================================== -->
-
    <extension-point id="ProcessList" name="%ProcessList.name" schema="schema/ProcessList.exsd"/>
-
 <!-- =================================================================================== -->
 <!-- Extension Point: IErrorParser, error parsers use when building                      -->
 <!-- =================================================================================== -->
-
    <extension-point id="ErrorParser" name="%ErrorParser.name"/>
-
 <!-- =================================================================================== -->
 <!-- Extension Point: IBinaryParser, use to detect wheter an IFile is a binary           -->
 <!-- =================================================================================== -->
-
    <extension-point id="BinaryParser" name="BinaryParser"/>
-
-<!-- =================================================================================== -->
-<!-- Extension Point: ????????????????                                                   -->
-<!-- =================================================================================== -->
-
-   <extension-point id="CToolchain" name="C/C++ Toolchain Provider" schema="schema/CToolchain.exsd"/>
-   <extension-point id="CBuildConfiguration" name="C/C++ Build Configuration" schema="schema/CBuildConfiguration.exsd"/>
-   <extension-point id="CTool" name="C/C++ Tool" schema="schema/CTool.exsd"/>
-   <extension-point id="CBuildVariable" name="C/C++ Build Variable" schema="schema/CBuildVariable.exsd"/>
-   <extension-point id="CToolType" name="C/C++ Tool Type" schema="schema/CToolType.exsd"/>
    <extension-point id="ScannerInfoProvider" name="Scanner Information Provider"/>
 
-
-<!-- =================================================================================== -->
-<!-- Extension Point: ????????????????                                                   -->
-<!-- =================================================================================== -->
-
-   <extension
-         point="org.eclipse.cdt.core.CToolType">
-      <type
-            name="C Compiler"
-            id="org.eclipse.cdt.core.tool.c_compiler">
-      </type>
-      <type
-            name="C++ Compiler"
-            id="org.eclipse.cdt.core.tool.c++_compiler">
-      </type>
-      <type
-            name="Preprocessor"
-            id="org.eclipse.cdt.core.tool.c_preprocessor">
-      </type>
-      <type
-            name="Assembler"
-            id="org.eclipse.cdt.core.tool.assembler">
-      </type>
-      <type
-            name="Linker"
-            id="org.eclipse.cdt.core.tool.linker">
-      </type>
-      <type
-            name="Archiver"
-            id="org.eclipse.cdt.core.tool.archiver">
-      </type>
-      <type
-            name="Debugger"
-            id="org.eclipse.cdt.core.tool.debugger">
-      </type>
-      <type
-            name="Profiler"
-            id="org.eclipse.cdt.core.tool.profiler">
-      </type>
-      <type
-            name="Symbol Stripper"
-            id="org.eclipse.cdt.core.tool.strip">
-      </type>
-   </extension>
-
 <!-- =================================================================================== -->
 <!-- Define the list of the Binary Parser provided by the CDT                            -->
 <!-- =================================================================================== -->
@@ -129,8 +62,7 @@
          </run>
       </cextension>
    </extension>
-
-   <!-- extension
+<!-- extension
          id="GNU_ELF"
          name="GNU Elf Parser"
          point="org.eclipse.cdt.core.BinaryParser">
@@ -140,7 +72,6 @@
          </run>
       </cextension>
    </extension -->
-
    <extension
          id="PE"
          name="PE Windows Parser"
@@ -151,7 +82,6 @@
          </run>
       </cextension>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- Define the list of Error Parser provided by the CDT                                 -->
 <!-- =================================================================================== -->
@@ -163,7 +93,6 @@
             class="org.eclipse.cdt.internal.errorparsers.GCCErrorParser">
       </errorparser>
    </extension>
-
    <extension
          id="GASErrorParser"
          name="CDT GNU Assembler Error Parser"
@@ -172,7 +101,6 @@
             class="org.eclipse.cdt.internal.errorparsers.GASErrorParser">
       </errorparser>
    </extension>
-
    <extension
          id="GLDErrorParser"
          name="CDT GNU Linker Error Parser"
@@ -181,7 +109,6 @@
             class="org.eclipse.cdt.internal.errorparsers.GLDErrorParser">
       </errorparser>
    </extension>
-
    <extension
          id="MakeErrorParser"
          name="CDT GNU Make Error Parser"
@@ -190,7 +117,6 @@
             class="org.eclipse.cdt.internal.errorparsers.MakeErrorParser">
       </errorparser>
    </extension>
-
    <extension
          id="VCErrorParser"
          name="CDT Visual C Error Parser"
@@ -199,11 +125,9 @@
             class="org.eclipse.cdt.internal.errorparsers.VCErrorParser">
       </errorparser>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- Eclipse Builder provided by the CDT, to be removed to the MakePlugin                -->
 <!-- =================================================================================== -->
-
    <extension
          id="cbuilder"
          name="C Builder"
@@ -214,11 +138,9 @@
          </run>
       </builder>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- CDT customized problem markers: C Problem markers                                   -->
 <!-- =================================================================================== -->
-
    <extension
          id="problem"
          name="%CProblemMarker.name"
@@ -230,11 +152,9 @@
             type="org.eclipse.core.resources.textmarker">
       </super>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- CDT C Nature                                                                        -->
 <!-- =================================================================================== -->
-
    <extension
          id="cnature"
          name="%cnature.name"
@@ -245,11 +165,9 @@
          </run>
       </runtime>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- CDT C++ Nature                                                                      -->
 <!-- =================================================================================== -->
-
    <extension
          id="ccnature"
          name="%cnature.name"
@@ -260,23 +178,18 @@
          </run>
       </runtime>
    </extension>
-
-
 <!-- =================================================================================== -->
 <!-- Deprecated Make default command, will be removed.                                   -->
 <!-- =================================================================================== -->
-
    <extension
          point="org.eclipse.cdt.core.CBuildCommand">
       <buildcommand
             command="make">
       </buildcommand>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- Deprecated Make owner, will be removed.                                             -->
 <!-- =================================================================================== -->
-
    <extension
          id="make"
          name="%makeproject.name"
@@ -285,11 +198,9 @@
             class="org.eclipse.cdt.internal.core.make.MakeProject">
       </cproject>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- Deprecated Make builder, will be removed.                                           -->
 <!-- =================================================================================== -->
-
    <extension
          id="makeBuilder"
          name="%makebuildmodel.name"
@@ -298,11 +209,9 @@
             class="org.eclipse.cdt.internal.core.make.MakeBuilder">
       </run>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- Some well known C file extensions override for the team plugins                     -->
 <!-- =================================================================================== -->
-
    <extension
          point="org.eclipse.team.core.fileTypes">
       <fileTypes
@@ -358,11 +267,9 @@
             extension=".cdtproject">
       </fileTypes>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- Some well known C file extensions override for the team plugins                     -->
 <!-- =================================================================================== -->
-
    <extension
          point="org.eclipse.team.core.ignore">
       <ignore
@@ -390,11 +297,9 @@
             pattern="*.exe">
       </ignore>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- Extension Point(Note:Temporary): IScannerInfoProvider for the standard Builder      -->
 <!-- =================================================================================== -->
-
    <extension
          id="StandardBuildManager"
          point="org.eclipse.cdt.core.ScannerInfoProvider">
@@ -404,13 +309,18 @@
          </run>
       </cextension>
    </extension>
-
 <!-- =================================================================================== -->
 <!-- =================================================================================== -->
-
-    <extension id="task" name="%CTaskName" point="org.eclipse.core.resources.markers">
-        <super type="org.eclipse.core.resources.taskmarker"/> 
-        <persistent value="true"/>
-    </extension>
+   <extension
+         id="task"
+         name="%CTaskName"
+         point="org.eclipse.core.resources.markers">
+      <super
+            type="org.eclipse.core.resources.taskmarker">
+      </super>
+      <persistent
+            value="true">
+      </persistent>
+   </extension>
 
 </plugin>
diff --git a/core/org.eclipse.cdt.core/schema/CBuildConfiguration.exsd b/core/org.eclipse.cdt.core/schema/CBuildConfiguration.exsd
deleted file mode 100644
index 7b810545e1e..00000000000
--- a/core/org.eclipse.cdt.core/schema/CBuildConfiguration.exsd
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.core">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.cdt.core" id="CBuildConfiguration" name="C/C++ Build Configuration"/>
-   </appInfo>
-   <documentation>
-      [Enter description of this extension point]
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="configuration" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="configuration">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used to identify this build
-configuration in UI elements.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of a Java class implementing the ICBuildConfigurationProvider interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.cdt.core.builder.model.ICBuildConfigurationProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to idenitfy this build configuration.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="natures" type="string">
-            <annotation>
-               <documentation>
-                  project nature this build configuration is associated with.
-If '*' or not specified, it is associated with all project natures.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/core/org.eclipse.cdt.core/schema/CBuildVariable.exsd b/core/org.eclipse.cdt.core/schema/CBuildVariable.exsd
deleted file mode 100644
index adc32bed304..00000000000
--- a/core/org.eclipse.cdt.core/schema/CBuildVariable.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.core.builder">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.cdt.core.builder" id="CBuildVariable" name="C/C++ Build Variable"/>
-   </appInfo>
-   <documentation>
-      [Enter description of this extension point]
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="variable" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="variable">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of a Java class implementing the ICBuildVariableProvider
-interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.cdt.core.builder.model.ICBuildVariable"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to idenitfy this build variable provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="natures" type="string">
-            <annotation>
-               <documentation>
-                  project nature this build variable provider is associated with.
-If '*' or not specified, it is associated with all project natures.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/core/org.eclipse.cdt.core/schema/CTool.exsd b/core/org.eclipse.cdt.core/schema/CTool.exsd
deleted file mode 100644
index 30a6a4fcc76..00000000000
--- a/core/org.eclipse.cdt.core/schema/CTool.exsd
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.core.builder">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.cdt.core.builder" id="CTool" name="C/C++ Tool"/>
-   </appInfo>
-   <documentation>
-      [Enter description of this extension point]
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="tool" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="tool">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used to identify this tool in UI elements.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of a Java class implementing the ICTool interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.cdt.core.builder.model.ICTool"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to idenitfy this tool.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the type of this tool (corresponds to a CToolType id).
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/core/org.eclipse.cdt.core/schema/CToolType.exsd b/core/org.eclipse.cdt.core/schema/CToolType.exsd
deleted file mode 100644
index 75cf1b49b1e..00000000000
--- a/core/org.eclipse.cdt.core/schema/CToolType.exsd
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.core.builder">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.cdt.core.builder" id="CToolType" name="name"/>
-   </appInfo>
-   <documentation>
-      [Enter description of this extension point]
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="type" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="type">
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to idenitfy this type of tool.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used to identify this type of
-tool in UI elements.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/core/org.eclipse.cdt.core/schema/CToolchain.exsd b/core/org.eclipse.cdt.core/schema/CToolchain.exsd
deleted file mode 100644
index c762e9e53e5..00000000000
--- a/core/org.eclipse.cdt.core/schema/CToolchain.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.core">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.cdt.core" id="a CToolchainProvider" name="C/C++ Toolchain Provider"/>
-   </appInfo>
-   <documentation>
-      [Enter description of this extension point]
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="provider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="provider">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify this toolchain provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of a Java class implementing the ICToolchainProvider
-interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.cdt.core.builder.model.ICToolchainProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="natures" type="string">
-            <annotation>
-               <documentation>
-                  project nature this build configuration is associated with.
-If '*' or not specified, it is associated with all project natures.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 8441c68ab81..85a7d76e699 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -26,14 +26,12 @@
    <extension-point id="CCompletionContributor" name="%completionContributorName"/>
    <extension-point id="CElementFilters" name="%elementFiltersName"/>
    <extension-point id="BinaryParserPage" name="Binary Parser Page"/>
-
 <!-- =========================================================================== -->
-<!-- Extension Implementation: must implement org.eclipse.jface.text.ITextHover  -->
-<!-- Purpose: Provide a perspective specific text hovering for CEditor files     -->
 <!-- Extension point: org.eclipse.cdt.ui.textHovers                        -->
+<!-- Purpose: Provide a perspective specific text hovering for CEditor files     -->
+<!-- Extension Implementation: must implement org.eclipse.jface.text.ITextHover  -->
 <!-- =========================================================================== -->
    <extension-point id="textHovers" name="%textHoversName"/>
-   <extension-point id="CToolTabGroup" name="C/C++ Tool Configuration Tabs" schema="schema/CToolTabGroup.exsd"/>
 
 <!-- Implement our filters for C-View.  -->
    <extension
@@ -132,8 +130,8 @@
             id="org.eclipse.cdt.ui.CView">
       </view>
    </extension>
-<!-- The wizards -->
 <!-- For C Wizards -->
+<!-- The wizards -->
    <extension
          point="org.eclipse.ui.newWizards">
       <category
@@ -440,94 +438,6 @@
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
    </extension>
-<!--
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="Build Configurations"
-            icon="icons/full/build16/build_configs.gif"
-            category="org.eclipse.cdt.ui.views"
-            class="org.eclipse.cdt.ui.builder.internal.CBuildConfigView"
-            id="org.eclipse.cdt.ui.builder.internal.BuildConfigView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.CBuildConfiguration">
-      <configuration
-            natures="*"
-            name="Debug"
-            class="org.eclipse.cdt.core.builder.CDebugBuildConfigurationProvider"
-            id="org.eclipse.cdt.core.builder.debugBuildConfiguration">
-      </configuration>
-      <configuration
-            natures="*"
-            name="Release"
-            class="org.eclipse.cdt.core.builder.CReleaseBuildConfigurationProvider"
-            id="org.eclipse.cdt.core.builder.releaseBuildConfiguration">
-      </configuration>
-      <configuration
-            natures="*"
-            name="Profile"
-            class="org.eclipse.cdt.core.builder.CProfileBuildConfigurationProvider"
-            id="org.eclipse.cdt.core.builder.profileBuildConfiguration">
-      </configuration>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.CToolchain">
-      <provider
-            natures="*"
-            class="org.eclipse.cdt.gnu.tools.CGnuToolchainProvider"
-            id="org.eclipse.cdt.gnu.tools.native">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.CToolType">
-      <type
-            name="RPC Protocol Compiler"
-            id="org.eclipse.cdt.core.tool.rpcgen">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.CTool">
-      <tool
-            name="RPC Protocol Compiler"
-            type="org.eclipse.cdt.gnu.tools.rpcgen"
-            class="org.eclipse.cdt.gnu.tools.CToolRpcgen"
-            id="org.eclipse.cdt.gnu.tool.rpcgen">
-      </tool>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.CBuildVariable">
-      <variable
-            class="org.eclipse.cdt.gnu.tools.CStandardCVars"
-            id="org.eclipse.cdt.gnu.tools.stdCVars">
-      </variable>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.ui.CToolTabGroup">
-      <toolTabGroup
-            class="org.eclipse.cdt.gnu.tools.CTabGroupCC"
-            toolId="org.eclipse.cdt.gnu.tools.cc"
-            id="org.eclipse.cdt.gnu.tools.tabGroupCC">
-      </toolTabGroup>
-      <toolTabGroup
-            class="org.eclipse.cdt.gnu.tools.CTabGroupCXX"
-            toolId="org.eclipse.cdt.gnu.tools.cxx"
-            id="org.eclipse.cdt.gnu.tools.tabGroupCXX">
-      </toolTabGroup>
-      <toolTabGroup
-            class="org.eclipse.cdt.gnu.tools.CTabGroupCPP"
-            toolId="org.eclipse.cdt.gnu.tools.cpp"
-            id="org.eclipse.cdt.gnu.tools.tabGroupCPP">
-      </toolTabGroup>
-      <toolTabGroup
-            class="org.eclipse.cdt.gnu.tools.CTabGroupLD"
-            toolId="org.eclipse.cdt.gnu.tools.ld"
-            id="org.eclipse.cdt.gnu.tools.tabGroupLD">
-      </toolTabGroup>
-   </extension>
- -->
-   
    <extension
          id="org.eclipse.cdt.ui.CSearchPage"
          name="CSearchPage"
@@ -603,13 +513,12 @@
          </part>
       </actionSetPartAssociation>
    </extension>
-
    <extension
          point="org.eclipse.cdt.ui.BinaryParserPage">
       <parserPage
+            parserID="org.eclipse.cdt.core.GNU_ELF"
             class="org.eclipse.cdt.ui.dialogs.GNUElfBinaryParserPage"
-            id="ElfBinaryParserPage"
-            parserID="org.eclipse.cdt.core.GNU_ELF">
+            id="ElfBinaryParserPage">
       </parserPage>
    </extension>
 
diff --git a/core/org.eclipse.cdt.ui/schema/CToolTabGroup.exsd b/core/org.eclipse.cdt.ui/schema/CToolTabGroup.exsd
deleted file mode 100644
index 606c100dea1..00000000000
--- a/core/org.eclipse.cdt.ui/schema/CToolTabGroup.exsd
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.cdt.core.builder">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.cdt.core.builder" id="CToolConfigurationTabGroup" name="C/C++ Tool Configuration Tab Group"/>
-   </appInfo>
-   <documentation>
-      [Enter description of this extension point]
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="toolTabGroup"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="toolTabGroup">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to idenitfy this tab group.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of a Java class implementing the ICToolConfigurationTabGroup
-interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.cdt.ui.builder.ICToolConfigurationTabGroup"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>