diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java
index 2c9703ec..f560cc51 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java
@@ -22,7 +22,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.web.util.UrlPathHelper;
 import org.springframework.webflow.core.collection.AttributeMap;
 
 /**
@@ -61,18 +60,12 @@ public class DefaultFlowUrlHandler implements FlowUrlHandler {
 
 	private String urlEncodingScheme = DEFAULT_URL_ENCODING_SCHEME;
 
-	private UrlPathHelper urlPathHelper;
-
-	public DefaultFlowUrlHandler() {
-		urlPathHelper = new UrlPathHelper();
-	}
-
 	public String getFlowExecutionKey(HttpServletRequest request) {
 		return request.getParameter("execution");
 	}
 
 	public String getFlowId(HttpServletRequest request) {
-		return request.getPathInfo().substring(0);
+		return request.getPathInfo().substring(1);
 	}
 
 	public String createFlowExecutionUrl(String flowId, String flowExecutionKey, HttpServletRequest request) {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java
index 71fb5ce7..273d4d7e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java
@@ -33,10 +33,8 @@ import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.webflow.context.ExternalContext;
 import org.springframework.webflow.core.AnnotatedObject;
 import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.definition.StateDefinition;
@@ -510,15 +508,6 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 
 	// behavioral code, could be overridden in subclasses
 
-	/**
-	 * Factory method that creates the initial input map to pass to this flow when a new execution of this flow is
-	 * started. Allows this flow to assemble the input map from data in the external context representing the calling
-	 * environment.
-	 */
-	public MutableAttributeMap createExecutionInputMap(ExternalContext context) {
-		return new LocalAttributeMap();
-	}
-
 	/**
 	 * Start a new session for this flow in its start state. This boils down to the following:
 	 * <ol>