diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java
index be4d6be0af8..c4e4854b253 100644
--- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java
@@ -14,7 +14,6 @@ package org.eclipse.cdt.codan.internal.checkers;
 
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 
 import org.eclipse.cdt.codan.core.cxx.CxxAstUtils;
 import org.eclipse.cdt.codan.core.cxx.model.AbstractAstFunctionChecker;
@@ -192,7 +191,6 @@ public class ReturnChecker extends AbstractAstFunctionChecker {
 	}
 	
 	public Collection<IBasicBlock> getDeadBlocks(IASTFunctionDefinition func) {
-		Collection<IBasicBlock> result = new LinkedHashSet<IBasicBlock>();
 		IControlFlowGraph graph = getModelCache().getControlFlowGraph(func);
 		return ((ControlFlowGraph) graph).getDeadNodes();
 	}
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
index 885c9415d5c..22107d096e0 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
@@ -84,7 +84,7 @@ public class CodanTestCase extends BaseTestCase {
 	}
 
 	@Override
-	public void tearDown() throws CoreException {
+	public void tearDown() throws Exception {
 		if (cproject != null) {
 			try {
 				cproject.getProject().delete(IResource.FORCE | IResource.ALWAYS_DELETE_PROJECT_CONTENT, new NullProgressMonitor());
@@ -92,6 +92,7 @@ public class CodanTestCase extends BaseTestCase {
 				throw e;
 			}
 		}
+		super.tearDown();
 	}
 
 	/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java
index 6417d4f6cb9..59a93cea19b 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java
@@ -61,6 +61,8 @@ public class TestUtils {
 		InputStream st = null;
 		if (plugin != null) {
 			URL resource = plugin.getBundle().getResource(srcRoot + "/" + classFile);
+			if (resource == null)
+				throw new IOException("Cannot find file " + srcRoot + "/" + classFile + " in bundle " + plugin.getBundle().getBundleId());
 			st = resource.openStream();
 		} else {
 			st = clazz.getResourceAsStream("/" + classFile);
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
index cae78762be4..29f2ea1e3d2 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
@@ -80,7 +80,7 @@ public abstract class QuickFixTestCase extends CheckerTestCase {
 	}
 
 	@Override
-	public void tearDown() throws CoreException {
+	public void tearDown() throws Exception {
 		Display.getDefault().syncExec(new Runnable() {
 			@Override
 			public void run() {
diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/NodeFactory.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/NodeFactory.java
index a1266d0470c..067ce97e1a8 100644
--- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/NodeFactory.java
+++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/NodeFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Alena Laskavaia 
+ * Copyright (c) 2009, 2010 Alena Laskavaia
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,6 @@ package org.eclipse.cdt.codan.internal.core.cfg;
 
 import org.eclipse.cdt.codan.core.model.cfg.IBranchNode;
 import org.eclipse.cdt.codan.core.model.cfg.IConnectorNode;
-import org.eclipse.cdt.codan.core.model.cfg.IControlFlowGraph;
 import org.eclipse.cdt.codan.core.model.cfg.IDecisionNode;
 import org.eclipse.cdt.codan.core.model.cfg.IExitNode;
 import org.eclipse.cdt.codan.core.model.cfg.IJumpNode;
@@ -24,24 +23,12 @@ import org.eclipse.cdt.codan.core.model.cfg.IStartNode;
  * Factory that creates cfg nodes
  */
 public class NodeFactory implements INodeFactory {
-	IControlFlowGraph graph;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory#
-	 * getControlFlowGraph()
-	 */
-	public IControlFlowGraph getControlFlowGraph() {
-		return graph;
-	}
-
 	public NodeFactory() {
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createPlainNode ()
 	 */
 	@Override
@@ -51,7 +38,7 @@ public class NodeFactory implements INodeFactory {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createJumpNode ()
 	 */
 	@Override
@@ -61,7 +48,7 @@ public class NodeFactory implements INodeFactory {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory#
 	 * createDecisionNode()
 	 */
@@ -72,7 +59,7 @@ public class NodeFactory implements INodeFactory {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory#
 	 * createConnectiorNode()
 	 */
@@ -83,7 +70,7 @@ public class NodeFactory implements INodeFactory {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createStartNode ()
 	 */
 	@Override
@@ -93,7 +80,7 @@ public class NodeFactory implements INodeFactory {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createExitNode ()
 	 */
 	@Override