diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index f8337c607dc..66d0b038c9b 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-30 Mikhail Khodjaiants
+	Cleanup.
+	* CModule.java
+	* CThread.java
+	* CValue.java
+
 2005-12-29 Mikhail Khodjaiants
 	Temporary fix for bug 122344: Memory monitors are not shown in the Memory view.
 	* CMemoryBlockRetrievalExtension.java
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 a17cb2bb88f..9089002e834 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
@@ -192,7 +192,7 @@ public class CModule extends CDebugElement implements ICModule {
 			return getCElement();
 		}
 		if ( IBinary.class.equals( adapter ) && getCElement() instanceof IBinary ) {
-			return (IBinary)getCElement();
+			return getCElement();
 		}
 		return super.getAdapter( adapter );
 	}
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 d2153050fe8..972d7dc61cd 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
@@ -821,9 +821,8 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 				// Alain: Put a proper fix later.
 				Object obj = getTopStackFrame();
 				if (obj instanceof ICStackFrame) {
-					return (ICStackFrame)obj;
+					return obj;
 				}
-				//return (ICStackFrame)getTopStackFrame();
 			}
 			catch( DebugException e ) {
 				// do nothing
@@ -836,9 +835,8 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 				// Alain: Put a proper fix later.
 				Object obj = getTopStackFrame();
 				if (obj instanceof ICStackFrame) {
-					return (ICStackFrame)obj;
+					return obj;
 				}
-				//return (ICStackFrame)getTopStackFrame();
 			}
 			catch( DebugException e ) {
 				// do nothing
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
index b5e540f2c73..6cf1cea63f9 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
@@ -170,7 +170,7 @@ public class CValue extends AbstractCValue {
 			}
 		}
 		catch( CDIException e ) {
-			requestFailed( e.getMessage(), e ); //$NON-NLS-1$
+			requestFailed( e.getMessage(), e );
 		}
 		return Arrays.asList( vars );
 	}