diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/BuildRunnerHelper.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/BuildRunnerHelper.java
index 768fbad6ab6..f96b99bdc7c 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/BuildRunnerHelper.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/BuildRunnerHelper.java
@@ -425,7 +425,7 @@ public class BuildRunnerHelper implements Closeable {
 		if (consoleInfo != null) {
 			toConsole(goodbye);
 		} else {
-			// FIXME in current flow goodbye() can be called after close(), that is a problem with design of BuildRunnerHelper
+			// in current flow goodbye() can be called after close()
 			try {
 				consoleInfo = console.getInfoStream();
 				toConsole(goodbye);
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ConsoleOutputSniffer.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ConsoleOutputSniffer.java
index 150b1bb0431..0744f623f0b 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ConsoleOutputSniffer.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ConsoleOutputSniffer.java
@@ -14,9 +14,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.ErrorParserManager;
 import org.eclipse.cdt.core.IConsoleParser;
-import org.eclipse.cdt.core.IErrorParser;
 
 
 /**
@@ -119,8 +117,6 @@ public class ConsoleOutputSniffer {
 	private OutputStream consoleErrorStream;
 	private IConsoleParser[] parsers;
 
-	private ErrorParserManager errorParserManager = null;
-
 	public ConsoleOutputSniffer(IConsoleParser[] parsers) {
 		this.parsers = parsers;
 	}
@@ -131,11 +127,6 @@ public class ConsoleOutputSniffer {
 		this.consoleErrorStream = errorStream;
 	}
 
-	public ConsoleOutputSniffer(OutputStream outputStream, OutputStream errorStream, IConsoleParser[] parsers, ErrorParserManager epm) {
-		this(outputStream, errorStream, parsers);
-		this.errorParserManager = epm;
-	}
-
 	/**
 	 * Returns an output stream that will be sniffed.
 	 * This stream should be hooked up so the command
@@ -168,9 +159,8 @@ public class ConsoleOutputSniffer {
 				try {
 					parsers[i].shutdown();
 				} catch (Throwable e) {
-					// Report exception if any but let all the parsers chance to shutdown.
+					// Report exception if any but let all the parsers a chance to shutdown.
 					CCorePlugin.log(e);
-				} finally {
 				}
 			}
 		}
@@ -184,13 +174,8 @@ public class ConsoleOutputSniffer {
 	private synchronized void processLine(String line) {
 		for (IConsoleParser parser : parsers) {
 			try {
-				if (parser instanceof IErrorParser) {
-					// IErrorParser interface is used here only with purpose to pass ErrorParserManager
-					// which keeps track of CWD and provides useful methods for locating files
-					((IErrorParser)parser).processLine(line, errorParserManager);
-				} else {
-					parser.processLine(line);
-				}
+				// Report exception if any but let all the parsers a chance to process the line.
+				parser.processLine(line);
 			} catch (Throwable e) {
 				CCorePlugin.log(e);
 			}