diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java
index f9d26b78..df8b30c6 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java
@@ -551,18 +551,9 @@ public class XmlFlowBuilder extends AbstractFlowBuilder implements ResourceHolde
 	private String getStartStateId(Element element) {
 		String startState = "start-state";
 		if (element.hasAttribute(startState)) {
-			Element startStateElement = DomUtils.getChildElementByTagName(element, startState);
-			Assert
-					.isNull(startStateElement,
-							"Define either a flow 'start-state' attribute or use the classic 'start-state' element.  Do not use both.");
 			return element.getAttribute(startState);
 		} else {
-			Element startStateElement = DomUtils.getChildElementByTagName(element, startState);
-			if (startStateElement != null) {
-				return startStateElement.getAttribute("idref");
-			} else {
-				return null;
-			}
+			return null;
 		}
 	}
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-2.0.xsd b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-2.0.xsd
index 0de9e313..4f0df56d 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-2.0.xsd
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-2.0.xsd
@@ -292,20 +292,6 @@ For example:
 						<xsd:documentation>
 							<![CDATA[
 Defines flow startup logic to execute. This logic will always execute when this flow is started.
-]]>
-						</xsd:documentation>
-					</xsd:annotation>
-				</xsd:element>
-				<xsd:element ref="start-state" minOccurs="0">
-					<xsd:annotation>
-						<xsd:documentation>
-							<![CDATA[
-Identifies the starting point of this flow.  The start state is the point where flow execution begins.
-
-This element is an alternative to the 'start-state' attribute.  In general, the 'start-state' attribute
-is performed when you wish to explictly denote the flow start-state.
-
-If not specified, the default start state is the first state defined in the document.
 ]]>
 						</xsd:documentation>
 					</xsd:annotation>
@@ -488,20 +474,6 @@ If not specified, the default start state is the first state defined in the docu
 	</xsd:element>
 
 	<!-- Sub elements -->
-	<xsd:element name="start-state">
-		<xsd:complexType>
-			<xsd:attribute name="idref" type="xsd:IDREF" use="required">
-				<xsd:annotation>
-					<xsd:documentation>
-						<![CDATA[
-The identifier of the start state of this flow.  The start state is the point where flow execution begins.
-]]>
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:attribute>
-		</xsd:complexType>
-	</xsd:element>
-
 	<xsd:element name="input-mapper">
 		<xsd:complexType>
 			<xsd:sequence>
@@ -635,8 +607,7 @@ The value of this attribute; a short-cut alternative to an explicit child 'value
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="persistence-context">
-	</xsd:element>
+	<xsd:element name="persistence-context"/>
 
 	<xsd:element name="var">
 		<xsd:complexType>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderTests.java
index 4913fbb7..a81ec5c6 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderTests.java
@@ -56,15 +56,6 @@ public class XmlFlowBuilderTests extends TestCase {
 		assertEquals("end", flow.getStartState().getId());
 	}
 
-	public void testBuildFlowWithStartStateElement() {
-		ClassPathResource resource = new ClassPathResource("flow-startstate-element.xml", getClass());
-		builder = new XmlFlowBuilder(resource);
-		FlowAssembler assembler = new FlowAssembler(builder, new MockFlowBuilderContext("flow"));
-		Flow flow = assembler.assembleFlow();
-		assertEquals("flow", flow.getId());
-		assertEquals("end", flow.getStartState().getId());
-	}
-
 	public void testCustomFlowAttribute() {
 		ClassPathResource resource = new ClassPathResource("flow-custom-attribute.xml", getClass());
 		builder = new XmlFlowBuilder(resource);
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-startstate-element.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-startstate-element.xml
deleted file mode 100644
index b1bee2a1..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-startstate-element.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<flow xmlns="http://www.springframework.org/schema/webflow"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
-
-	<start-state idref="end"/>
-	
-	<end-state id="foo"/>
-	<end-state id="end"/>
-
-</flow>
\ No newline at end of file