diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java
index 318cdd8f1f2..04b4de4d735 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java
@@ -114,9 +114,8 @@ public abstract class CElement extends PlatformObject implements ICElement {
 					if (offset < endPos && offset >= startPos) {
 						if (child instanceof Parent) {
 							return ((Parent)child).getSourceElementAtOffset(offset);
-						} else {
-							return (ICElement)child;
 						}
+						return (ICElement)child;
 					}
 				}
 			}
@@ -157,9 +156,6 @@ public abstract class CElement extends PlatformObject implements ICElement {
 			children = new ICElement[list.size()];
 			list.toArray(children);
 			return children;
-		} else {
-			// should not happen
-			//Assert.isTrue(false);
 		}
 		return new ICElement[]{this};
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr2line.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr2line.java
index 08d303a7e94..7796268ce22 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr2line.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr2line.java
@@ -24,7 +24,7 @@ public class Addr2line {
 	private BufferedReader stdout;
 	private BufferedWriter stdin;
 	private String lastaddr, lastsymbol, lastline;
-	private boolean isDisposed = false;
+	//private boolean isDisposed = false;
 
 	public Addr2line(String command, String[] params, String file) throws IOException {
 		init(command, params, file);
@@ -129,7 +129,7 @@ public class Addr2line {
 		} catch (IOException e) {
 		}
 		addr2line.destroy();
-		isDisposed = true;
+		//isDisposed = true;
 	}
 }
 
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/CPPFilt.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/CPPFilt.java
index fb722311acd..92fec5b3e78 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/CPPFilt.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/CPPFilt.java
@@ -24,7 +24,7 @@ public class CPPFilt {
 	private Process cppfilt;
 	private BufferedReader stdout;
 	private BufferedWriter stdin;
-	private boolean isDisposed = false;
+	//private boolean isDisposed = false;
 
 	public CPPFilt(String command, String[] params) throws IOException {
 		init(command, params);
@@ -71,6 +71,6 @@ public class CPPFilt {
 		catch (IOException e) {
 		}
 		cppfilt.destroy();
-		isDisposed = true;
+		//isDisposed = true;
 	}
 }