diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
index 498676dea63..4836460df67 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
@@ -1286,6 +1286,7 @@ public class CCorePlugin extends Plugin {
 	/**
 	 * @deprecated use {@link ITranslationUnit} or {@link ILanguage} to
 	 *             construct ASTs, instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public org.eclipse.cdt.core.dom.CDOM getDOM() {
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/dom/CDOM.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/dom/CDOM.java
index 09c9de469f9..e3afe1b8cbc 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/dom/CDOM.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/dom/CDOM.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    IBM - Initial API and implementation
+ *     IBM - Initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.core.dom;
 import org.eclipse.cdt.core.dom.ast.IASTCompletionNode;
@@ -20,13 +20,9 @@ import org.eclipse.core.resources.IStorage;
 /**
  * @author jcamelon
  *
- * This class serves as the manager of the AST/DOM mechanisms for the CDT.
- * It should be eventually added to CCorePlugin for startup.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
  * @deprecated This class does not take into account language mappings.  Use
- * org.eclipse.cdt.core.model.ILanguage instead.
+ * {@link org.eclipse.cdt.core.model.ILanguage} instead.
+ * @noreference This class is not intended to be referenced by clients.
  */
 @Deprecated
 public class CDOM implements IASTServiceProvider {
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/dom/IASTServiceProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/dom/IASTServiceProvider.java
index ab26b263184..86aeb7b0acd 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/dom/IASTServiceProvider.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/dom/IASTServiceProvider.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * IBM - Initial API and implementation
+ *     IBM - Initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.core.dom;
 
@@ -19,10 +19,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IStorage;
 
 /**
- * This is the mechanism that represents a parser service in the CDT.
- * 
- * IASTTranslationUnits and ASTCompletionNodes are artifacts that this service returns.
- * 
  * @author jcamelon
  * @deprecated Use methods provided by {@link ITranslationUnit} or {@link ILanguage}.
  * @noreference This interface is not intended to be referenced by clients.