diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
index 493a532244d..27169b5be40 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
@@ -366,7 +366,12 @@ public class NewClassWizardUtil {
 	 * @param typeName  qualified name of the type to search
 	 * @param project  
 	 * @param pdomNodeType PDOMCPPLinkage type
-	 * @return
+	 * @return one of {@link #SEARCH_MATCH_ERROR}, 
+	 * {@link #SEARCH_MATCH_FOUND_ANOTHER_NAMESPACE},
+	 * {@link #SEARCH_MATCH_FOUND_ANOTHER_TYPE}, 
+	 * {@link #SEARCH_MATCH_FOUND_EXACT_ANOTHER_TYPE},
+	 * {@link #SEARCH_MATCH_FOUND_EXACT} or
+	 * {@link #SEARCH_MATCH_NOTFOUND}.	 
 	 */
 	public static int searchForCppType(IQualifiedTypeName typeName, ICProject project, int pdomNodeType) {
 		if(project == null) {
@@ -445,7 +450,7 @@ public class NewClassWizardUtil {
 		{
 			if (parent instanceof PDOMBinding)
 			{							
-				buf.insert(0, ((PDOMBinding)parent).getName() + "::");
+				buf.insert(0, ((PDOMBinding)parent).getName() + "::"); //$NON-NLS-1$
 			}
 			parent = parent.getParentNode();
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java
index 3b0080724ef..5043b639c5a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java
@@ -11,10 +11,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.ui.wizards;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.regex.Pattern;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -56,9 +54,6 @@ import org.eclipse.cdt.core.browser.PathUtil;
 import org.eclipse.cdt.core.browser.QualifiedTypeName;
 import org.eclipse.cdt.core.browser.TypeSearchScope;
 import org.eclipse.cdt.core.browser.TypeUtil;
-import org.eclipse.cdt.core.dom.IPDOMManager;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage;
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICContainer;
@@ -70,12 +65,7 @@ import org.eclipse.cdt.core.parser.IScannerInfoProvider;
 import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
 import org.eclipse.cdt.ui.CUIPlugin;
 
-import org.eclipse.cdt.internal.core.pdom.PDOM;
-import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
-import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode;
-import org.eclipse.cdt.internal.core.pdom.dom.cpp.PDOMCPPClassType;
 import org.eclipse.cdt.internal.core.pdom.dom.cpp.PDOMCPPLinkage;
-import org.eclipse.cdt.internal.core.pdom.dom.cpp.PDOMCPPNamespace;
 
 import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
 import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;