diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java
index 68c8b62a129..9f74e371245 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2013 Intel Corporation and others.
+ * Copyright (c) 2005, 2018 Intel Corporation and others.
  * 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
@@ -115,10 +115,6 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase {
 
 	private class OptionData extends OptionContextData {
 		private IBuildObject fOptionContainer;
-		public OptionData(IOption option, IBuildObject parent) {
-			this(option, parent, parent);
-		}
-
 		public OptionData(IOption option, IBuildObject parent,  IBuildObject optionContainer) {
 			super(option, parent);
 			fOptionContainer = optionContainer;
diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CodanMarkerGenerator.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CodanMarkerGenerator.java
index 6bbab47b5ca..718668ff29f 100644
--- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CodanMarkerGenerator.java
+++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CodanMarkerGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 QNX Software Systems and others.
+ * Copyright (c) 2015, 2018 QNX Software Systems and others.
  * 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
@@ -57,7 +57,6 @@ public class CodanMarkerGenerator implements IMarkerGenerator {
 		IProblemLocationFactory factory = CodanRuntime.getInstance().getProblemLocationFactory();
 		if (info.file instanceof IFile)
 			return factory.createProblemLocation((IFile) info.file, info.startChar, info.endChar, info.lineNumber);
-		else
-			return new CodanProblemLocation(info.file, info.startChar, info.endChar, info.lineNumber);
+		return new CodanProblemLocation(info.file, info.startChar, info.endChar, info.lineNumber);
 	}
 }