diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 084b18c1def..2410a23763b 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-27 Mikhail Khodjaiants
+	Cleanup.
+	* BreakpointManager.java
+	* RegisterManager.java
+
 2005-12-27 Mikhail Khodjaiants
 	Bug 109526: Support Eclipse-LazyStart and deprecate Eclipse-AutoStart.
 	* MANIFEST.MF
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
index 70c3879b980..4e3ecdb1ae7 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/BreakpointManager.java
@@ -775,14 +775,11 @@ public class BreakpointManager extends Manager {
 			// Put the condition now.
 			String exprCond = null;
 			int ignoreCount = 0;
-			String[] threadIds = null;
-			StringBuffer line = new StringBuffer();
 
 			ICDICondition condition = watchpoint.getCondition();
 			if (condition != null) {
 				exprCond = condition.getExpression();
 				ignoreCount = condition.getIgnoreCount();
-				threadIds = condition.getThreadIds();
 			}
 			if (exprCond != null && exprCond.length() > 0) {
 				MIBreakCondition breakCondition = factory.createMIBreakCondition(no, exprCond);				
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
index 542ace5bdc7..6d495e7cd37 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java
@@ -199,7 +199,7 @@ public class RegisterManager extends Manager {
 		Register reg = findRegister(regDesc);
 		if (reg == null) {
 			try {
-				String name = regDesc.getQualifiedName(); //$NON-NLS-1$
+				String name = regDesc.getQualifiedName();
 				Target target = (Target)regDesc.getTarget();
 				MISession mi = target.getMISession();
 				CommandFactory factory = mi.getCommandFactory();
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog b/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog
index a2827f42b21..29fbcb3c68f 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.ui/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-27 Mikhail Khodjaiants
+	Cleanup.
+	* MIUIPlugin.java
+
 2005-12-27 Mikhail Khodjaiants
 	Bug 109526: Support Eclipse-LazyStart and deprecate Eclipse-AutoStart.
 	* MANIFEST.MF
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java
index 2459020d6cb..1879a158970 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java
+++ b/debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java
@@ -60,7 +60,7 @@ public class MIUIPlugin extends AbstractUIPlugin {
 			// If the default instance is not yet initialized,
 			// return a static identifier. This identifier must
 			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID; //$NON-NLS-1$
+			return PLUGIN_ID;
 		}
 		return getDefault().getBundle().getSymbolicName();
 	}