diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 5f48f93694b..7dbb72d95ca 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-16 Mikhail Khodjaiants
+	Bug 82264: Enhance the Shared Libraries view.
+	Cleanup of the ICModule interface.
+	* ICModule.java
+	* CModule.java
+	
 2005-02-15 Mikhail Khodjaiants
 	Bug 82264: Enhance the Shared Libraries view.
 	Support for the symbols loading operations.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICModule.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICModule.java
index 3b9bc3e3fd1..4203131721a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICModule.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICModule.java
@@ -32,11 +32,6 @@ public interface ICModule extends ICDebugElement {
 	 */
 	public static final int SHARED_LIBRARY = 2;
 
-	/**
-	 * Type constant which identifies core files.
-	 */
-	public static final int CORE = 3;
-
 	/**
 	 * Returns the type of this module.
 	 * The returned value will be one of <code>EXECUTABLE</code>, 
@@ -140,11 +135,4 @@ public interface ICModule extends ICDebugElement {
 	 * @return the CPU identifier
 	 */
 	public String getCPU();
-
-	/**
-	 * Returns whether the symbols of this module can be loaded from another file.
-	 * 
-	 * @return whether the symbols of this module can be loaded from another file
-	 */
-	public boolean canModifySymbolsSource();
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java
index a9c023dc56f..d3329ba7d19 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java
@@ -26,6 +26,9 @@ import org.eclipse.debug.core.DebugException;
  
 /**
  * The CDI based implementation of <code>ICModule</code>.
+ * 
+ * This implementation is experimental and needs to be changed when
+ * the CDI level support is available. 
  */
 public class CModule extends CDebugElement implements ICModule {
 
@@ -48,11 +51,6 @@ public class CModule extends CDebugElement implements ICModule {
 		return new CModule( SHARED_LIBRARY, target, lib );
 	}
 
-	public static CModule createCore( CDebugTarget target, IPath path ) {
-		// TODO Add support for core file to CDI.
-		return new CModule( CORE, target, path );
-	}
-
 	/** 
 	 * Constructor for CModule. 
 	 */
@@ -186,13 +184,6 @@ public class CModule extends CDebugElement implements ICModule {
 		return ( fCElement instanceof IBinary ) ? ((IBinary)fCElement).getCPU() : null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.core.model.ICModule#canModifySymbolsSource()
-	 */
-	public boolean canModifySymbolsSource() {
-		return true;
-	}
-
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
@@ -223,7 +214,7 @@ public class CModule extends CDebugElement implements ICModule {
 			requestFailed( CoreModelMessages.getString( "CModule.2" ), null ); //$NON-NLS-1$
 		}
 		String message = CoreModelMessages.getString( "CModule.4" ); //$NON-NLS-1$
-		if ( fCDIObject instanceof ICDISharedLibrary ) {
+		if ( fCDIObject instanceof ICDISharedLibrary && path.equals( getSymbolsFileName() )) {
 			try {
 				((ICDISharedLibrary)fCDIObject).loadSymbols();
 				return;