diff --git a/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManager.java b/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManager.java
index 4aae0d332859770ba751c1069fd805e159b3a012..4ccf427999264ae60efc224ead68a11344dba9d1 100644
--- a/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManager.java
+++ b/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManager.java
@@ -141,7 +141,7 @@ import eu.stratosphere.nephele.util.StringUtils;
 public class JobManager implements DeploymentManager, ExtendedManagementProtocol, InputSplitProviderProtocol,
 		JobManagerProtocol, ChannelLookupProtocol, JobStatusListener, PluginCommunicationProtocol {
 	
-	public static enum ExecutionMode { LOCAL, CLUSTER, CLOUD }
+	public static enum ExecutionMode { LOCAL, CLUSTER }
 	
 	// --------------------------------------------------------------------------------------------
 
@@ -404,10 +404,8 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol
 		final ExecutionMode executionMode;
 		if ("local".equals(executionModeName)) {
 			executionMode = ExecutionMode.LOCAL;
-		} else if ("local".equals(executionModeName)) {
+		} else if ("cluster".equals(executionModeName)) {
 			executionMode = ExecutionMode.CLUSTER;
-		} else if ("local".equals(executionModeName)) {
-			executionMode = ExecutionMode.CLOUD;
 		} else {
 			System.err.println("Unrecognized execution mode: " + executionModeName);
 			System.exit(FAILURERETURNCODE);
diff --git a/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManagerUtils.java b/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManagerUtils.java
index 9b2b83eda334e27bbf52e839ac4181700580bd67..efc674953929f1be1b6402e57ed3005a6596b452 100644
--- a/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManagerUtils.java
+++ b/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/jobmanager/JobManagerUtils.java
@@ -151,8 +151,6 @@ public class JobManagerUtils {
 			return "eu.stratosphere.nephele.jobmanager.scheduler.local.LocalScheduler";
 		case CLUSTER:
 			return "eu.stratosphere.nephele.jobmanager.scheduler.queue.QueueScheduler";
-		case CLOUD:
-			return "eu.stratosphere.nephele.jobmanager.scheduler.queue.QueueScheduler";
 		default:
 			throw new RuntimeException("Unrecognized Execution Mode.");
 		}
@@ -180,8 +178,6 @@ public class JobManagerUtils {
 			return "eu.stratosphere.nephele.instance.local.LocalInstanceManager";
 		case CLUSTER:
 			return "eu.stratosphere.nephele.instance.cluster.ClusterManager";
-		case CLOUD:
-			return "eu.stratosphere.nephele.instance.ec2.EC2CloudManager";
 		default:
 			throw new RuntimeException("Unrecognized Execution Mode.");
 		}