diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index a68af5c4331..f4e2c7b21f5 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-21 Mikhail Khodjaiants
+	Cleanup. Removed the session manager from the CDebugCorePlugin class.
+	* CDebugCorePlugin.java
+	
 2005-04-21 Mikhail Khodjaiants
 	Bug 80175: Replace the CDT source lookup by the source lookup provided by Eclipse platform.
 	* CDebugCorePlugin.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java
index 892da337a59..6bc7c819867 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java
@@ -15,7 +15,6 @@ import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocation;
 import org.eclipse.cdt.debug.internal.core.DebugConfiguration;
 import org.eclipse.cdt.debug.internal.core.ICDebugInternalConstants;
 import org.eclipse.cdt.debug.internal.core.ListenerList;
-import org.eclipse.cdt.debug.internal.core.SessionManager;
 import org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint;
 import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector;
 import org.eclipse.cdt.debug.internal.core.sourcelookup.CommonSourceLookupDirector;
@@ -67,8 +66,6 @@ public class CDebugCorePlugin extends Plugin {
 	 */
 	private CommonSourceLookupDirector fCommonSourceLookupDirector;
 
-	private SessionManager fSessionManager = null;
-
 	/**
 	 * The constructor.
 	 */
@@ -192,16 +189,6 @@ public class CDebugCorePlugin extends Plugin {
 		}
 	}
 
-	protected SessionManager getSessionManager() {
-		return fSessionManager;
-	}
-
-	protected void setSessionManager( SessionManager sm ) {
-		if ( fSessionManager != null )
-			fSessionManager.dispose();
-		fSessionManager = sm;
-	}
-
 	public void saveCommonSourceLocations( ICSourceLocation[] locations ) {
 		CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_SOURCE_LOCATIONS, SourceUtils.getCommonSourceLocationsMemento( locations ) );
 	}
@@ -254,14 +241,12 @@ public class CDebugCorePlugin extends Plugin {
 		initializeCommonSourceLookupDirector();
 		createBreakpointListenersList();
 		resetBreakpointsInstallCount();
-		setSessionManager( new SessionManager() );
 	}
 
 	/* (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
 	 */
 	public void stop( BundleContext context ) throws Exception {
-		setSessionManager( null );
 		disposeBreakpointListenersList();
 		resetBreakpointsInstallCount();
 		disposeCommonSourceLookupDirector();