diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTVisitor.java
index 004348f55fe..623f3f71cf3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTVisitor.java
@@ -31,7 +31,7 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTAmbiguousNode;
  * visit() methods implement a top-down traversal, and <br>
  * leave() methods implement a bottom-up traversal. <br>
  *
- * <p> Clients may subclass. </p>
+ * <p>Clients may subclass.</p>
  */
 public abstract class ASTVisitor {
 	/**
@@ -512,22 +512,6 @@ public abstract class ASTVisitor {
 		return PROCESS_CONTINUE;
 	}
 	
-	/**
-	 * @deprecated use {@link IASTTranslationUnit#getComments()}, instead.
-	 */
-	@Deprecated
-	public int visit( IASTComment comment){
-		return PROCESS_CONTINUE;
-	}
-
-	/**
-	 * @deprecated use {@link IASTTranslationUnit#getComments()}, instead.
-	 */
-	@Deprecated
-	public int leave( IASTComment comment){
-		return PROCESS_CONTINUE;
-	}
-
 	/**
 	 * For internal use, only. When {@link ASTVisitor#shouldVisitAmbiguousNodes} is set to true, the
 	 * visitor will be called for ambiguous nodes. However, the children of an ambiguous will not be
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenterVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenterVisitor.java
index 068fc65f5db..2fdd73d7ee8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenterVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenterVisitor.java
@@ -12,7 +12,6 @@
 package org.eclipse.cdt.internal.core.dom.rewrite.commenthandler;
 
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTComment;
 import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
 import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
@@ -212,14 +211,8 @@ public class ASTCommenterVisitor extends ASTVisitor {
 	}
 
 	@Override
-	public int leave(IASTProblem problem){
+	public int leave(IASTProblem problem) {
 		nodeCommenter.appendComments((ASTNode) problem);
 		return PROCESS_CONTINUE;
 	}
-
-	@Override
-	public int leave( IASTComment comment){
-		nodeCommenter.appendComments((ASTNode) comment);
-		return PROCESS_CONTINUE;
-	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/CPPASTAllVisitor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/CPPASTAllVisitor.java
index fc8c916fc44..4f4802c6b86 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/CPPASTAllVisitor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/CPPASTAllVisitor.java
@@ -12,10 +12,10 @@
 package org.eclipse.cdt.internal.ui.refactoring.utils;
 
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTComment;
 import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
+import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
 import org.eclipse.cdt.core.dom.ast.IASTExpression;
 import org.eclipse.cdt.core.dom.ast.IASTInitializer;
 import org.eclipse.cdt.core.dom.ast.IASTName;
@@ -25,10 +25,9 @@ import org.eclipse.cdt.core.dom.ast.IASTProblem;
 import org.eclipse.cdt.core.dom.ast.IASTStatement;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
 import org.eclipse.cdt.core.dom.ast.IASTTypeId;
-import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter;
-import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier;
 
 public class CPPASTAllVisitor extends ASTVisitor {
 	
@@ -112,12 +111,6 @@ public class CPPASTAllVisitor extends ASTVisitor {
 		return visitAll(problem);
 	}
 	
-	@Override
-	public int visit( IASTComment comment ){
-		return visitAll(comment);
-	}
-	
-
 	/**
 	 * Visit BaseSpecifiers.
 	 */