diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java
index 8b690cfc3cb..4c369639fb2 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildCommand.java
@@ -22,20 +22,17 @@ import org.eclipse.core.runtime.IPath;
 public class BuildCommand implements IBuildCommand {
 	private IPath fCmd;
 	private String fArgs[];
-	private Map fEnv;
+	private Map<String, String> fEnv;
 	private IPath fCWD;
-	private BuildStep fStep;
 	
-	public BuildCommand(IPath cmd, String args[], Map env, IPath cwd, BuildStep step){
+	public BuildCommand(IPath cmd, String args[], Map<String, String> env, IPath cwd, BuildStep step){
 		fCmd = cmd;
 		if(args != null)
 			fArgs = args.clone();
 		if(env != null)
-			fEnv = new HashMap(env);
+			fEnv = new HashMap<String, String>(env);
 		
 		fCWD = cwd;
-		
-		fStep = step;
 	}
 
 	/* (non-Javadoc)
@@ -57,9 +54,9 @@ public class BuildCommand implements IBuildCommand {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.builddescription.IBuildCommand#getEnvironment()
 	 */
-	public Map getEnvironment() {
+	public Map<String, String> getEnvironment() {
 		if(fEnv != null)
-			return new HashMap(fEnv);
+			return new HashMap<String, String>(fEnv);
 		return null;
 	}
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java
index a538bd7f009..ff5c85801fd 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java
@@ -14,9 +14,10 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 import org.eclipse.cdt.core.CommandLauncher;
 import org.eclipse.cdt.core.ICommandLauncher;
@@ -227,18 +228,18 @@ public class CommandBuilder implements IBuildModelBuilder {
 		return fErrMsg;
 	}
 	
-	private String[] mapToStringArray(Map map){
+	private String[] mapToStringArray(Map<String, String> map){
 		if(map == null)
 			return null;
 		
-		List list = new ArrayList();
+		List<String> list = new ArrayList<String>();
 		
-		for(Iterator iter = map.entrySet().iterator(); iter.hasNext();){
-			Map.Entry entry = (Map.Entry)iter.next();
-			list.add((String)entry.getKey() + "=" + (String)entry.getValue());	//$NON-NLS-1$
+		Set<Entry<String, String>> entrySet = map.entrySet();
+		for (Entry<String, String> entry : entrySet) {
+			list.add(entry.getKey() + '=' + entry.getValue());
 		}
 		
-		return (String[])list.toArray(new String[list.size()]);
+		return list.toArray(new String[list.size()]);
 	}
 
 	protected void printMessage(String msg, OutputStream os){
@@ -272,19 +273,19 @@ public class CommandBuilder implements IBuildModelBuilder {
 		return buf.toString();
 	}
 
-	private String getExecutable(String command, Map environment){
+	private String getExecutable(String command, Map<String, String> environment){
 		if(new Path(command).isAbsolute())
 			return command;
 		return searchExecutable(command, getPaths(environment));
 	}
 	
-	private String[] getPaths(Map env){
-		String pathsStr = (String)env.get(PATH_ENV);
+	private String[] getPaths(Map<String, String> env){
+		String pathsStr = env.get(PATH_ENV);
 		if(pathsStr == null){
-			for(Iterator iter = env.entrySet().iterator(); iter.hasNext();){
-				Map.Entry entry = (Map.Entry)iter.next();
-				if(PATH_ENV.equalsIgnoreCase((String)entry.getKey())){
-					pathsStr = (String)entry.getValue();
+			Set<Entry<String, String>> entrySet = env.entrySet();
+			for (Entry<String, String> entry : entrySet) {
+				if(PATH_ENV.equalsIgnoreCase(entry.getKey())){
+					pathsStr = entry.getValue();
 					break;
 				}
 			}