diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigExtensionReference.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigExtensionReference.java
index 7e495e1b653..1c6d192131a 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigExtensionReference.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigExtensionReference.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 Intel Corporation and others.
+ * Copyright (c) 2007, 2011 Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,10 +7,10 @@
  *
  * Contributors:
  * Intel Corporation - Initial API and implementation
+ * Kirk Beitz (Nokia) - [323094] documentation warnings
  *******************************************************************************/
 package org.eclipse.cdt.core.settings.model;
 
-import org.eclipse.cdt.core.ICExtensionReference;
 import org.eclipse.core.runtime.CoreException;
 
 /**
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.CoreException;
  * project configuration.  Like ICExtensionReference
  * but has knowledge of its ICConfigurationDescription
  * 
- * @see ICExtensionReference
+ * deprecated-@see ICExtensionReference
  */
 public interface ICConfigExtensionReference {
     /**
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java
index dedf377a725..c310b46310e 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICSettingsStorage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 Intel Corporation and others.
+ * Copyright (c) 2007, 2011 Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,10 +8,10 @@
  * Contributors:
  * Intel Corporation - Initial API and implementation
  * James Blackburn (Broadcom Corp.)
+ * Kirk Beitz (Nokia) - [323094] documentation warnings
  *******************************************************************************/
 package org.eclipse.cdt.core.settings.model;
 
-import org.eclipse.cdt.core.ICDescriptor;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationDataProvider;
 import org.eclipse.core.runtime.CoreException;
@@ -34,14 +34,13 @@ import org.eclipse.core.runtime.IProgressMonitor;
  * (.cproject) a relational database (.cprojectdb) or any other format of the extenders choosing.
  * <br /><br />
  * These capabilities are used by the build system for persisting build configuration data
- * as well as by the CoreModel {@link ICDescriptor} storage trees. See
+ * as well as by the CoreModel {@link ICConfigurationDescription} storage trees. See
  * {@link CConfigurationDataProvider#loadConfiguration(ICConfigurationDescription, IProgressMonitor)}
  * and {@link CConfigurationDataProvider#applyConfiguration(ICConfigurationDescription, ICConfigurationDescription, CConfigurationData, IProgressMonitor)}
  *
  * @see ICStorageElement
  * @see ICProjectDescription
  * @see ICConfigurationDescription
- * @see ICDescriptor
  * 
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
@@ -58,12 +57,6 @@ public interface ICSettingsStorage {
 	 */
 	ICStorageElement getStorage(String id, boolean create) throws CoreException;
 
-	/**
-	 * Return a Map of StorageID -> ICStorageElement
-	 * @return
-	 */
-//	Map<String, ICStorageElement> getStorages();
-
 	/**
 	 * Remove the storage module with the given ID from this ICSettingsStorage
 	 * @param id