diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 376fe46c90b..9eb5efd3786 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-21 Mikhail Khodjaiants
+	CThread cleanup.
+	* CThread.java
+
 2004-07-21 Mikhail Khodjaiants
 	Copied the target factory methods from CDebugModel to CDIDebugModel.
 	Marked the old methods as deprecated.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
index 68f6b6b3be6..45004878aba 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
@@ -59,8 +59,6 @@ import org.eclipse.debug.core.model.IStackFrame;
  */
 public class CThread extends CDebugElement implements ICThread, IRestart, IResumeWithoutSignal, ISwitchToFrame, ICDIEventListener {
 
-	private boolean fSuspending;
-
 	private final static int MAX_STACK_DEPTH = 100;
 
 	/**
@@ -88,10 +86,19 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 	 */
 	private boolean fIsCurrent = false;
 
+	/**
+	 * The last selected frame in this thread, <code>null</code> if thread is not suspended.
+	 */
 	private CStackFrame fLastStackFrame = null;
 
+	/**
+	 * The depth of the current stack.  
+	 */
 	private int fLastStackDepth = 0;
 
+	/**
+	 * Whether this thread is disposed.
+	 */
 	private boolean fDisposed = false;
 
 	/**
@@ -450,14 +457,6 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 		} );
 	}
 
-	protected void setSuspending( boolean value ) {
-		fSuspending = value;
-	}
-
-	protected boolean isSuspending() {
-		return fSuspending;
-	}
-
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IStep#canStepInto()
 	 */
@@ -680,7 +679,6 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 	protected void terminated() {
 		setState( CDebugElementState.TERMINATED );
 		dispose();
-		cleanup();
 	}
 
 	private void handleSuspendedEvent( ICDISuspendedEvent event ) {
@@ -869,6 +867,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 
 	protected void dispose() {
 		fDisposed = true;
+		cleanup();
 	}
 
 	protected boolean isDisposed() {