Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd
===================================================================
diff -u -r2463 -r2494
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd	(.../DamMStabInputDefinition.xsd)	(revision 2463)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Xsd/DamMStabInputDefinition.xsd	(.../DamMStabInputDefinition.xsd)	(revision 2494)
@@ -165,8 +165,6 @@
           <xs:attribute name="XOffsetSoilGeometry2DOrigin" type="xs:double" use="optional" />
           <xs:attribute name="MaterialForDike" type="xs:string" use="optional" />
           <xs:attribute name="MaterialForShoulder" type="xs:string" use="optional" />
-          <xs:attribute name="IsUseOriginalPLLineAssignments" type="xs:boolean" use="optional" />
-          <xs:attribute name="IsUseOriginalCalculationOptions" type="xs:boolean" use="optional" />
           <xs:attribute default="false" name="IsDrySituation" type="xs:boolean" use="optional" />
           <xs:attribute name="PLLineAssignment">
             <xs:simpleType>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs
===================================================================
diff -u -r2310 -r2494
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs	(.../DamMStabAssemblerTest.cs)	(revision 2310)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/DamMStabAssemblerTest.cs	(.../DamMStabAssemblerTest.cs)	(revision 2494)
@@ -187,8 +187,6 @@
             geometryCreationOptions.XOffsetSoilGeometry2DOrigin = 12.0;
             geometryCreationOptions.MaterialForDike = "clay dike";
             geometryCreationOptions.MaterialForShoulder = "sand shoulder";
-            geometryCreationOptions.IsUseOriginalPlLineAssignments = true;
-            geometryCreationOptions.IsUseOriginalCalculationOptions = true;
             geometryCreationOptions.IsDesign = true;
 
             // MStabDesignEmbankment design 
@@ -422,8 +420,6 @@
                 geometryCreationOptionsElement.AttributeAs<string>(DamMStabAssembler.XmlAttributeSoilGeometry2DFilename), DamMStabAssembler.XmlAttributeSoilGeometry2DFilename);
             Assert.AreEqual(geometryCreationOptions.MaterialForDike, geometryCreationOptionsElement.AttributeAs<string>(DamMStabAssembler.XmlAttributeMaterialForDike), DamMStabAssembler.XmlAttributeMaterialForDike);
             Assert.AreEqual(geometryCreationOptions.MaterialForShoulder, geometryCreationOptionsElement.AttributeAs<string>(DamMStabAssembler.XmlAttributeMaterialForShoulder), DamMStabAssembler.XmlAttributeMaterialForShoulder);
-            Assert.AreEqual(geometryCreationOptions.IsUseOriginalPlLineAssignments, geometryCreationOptionsElement.AttributeAs<bool>(DamMStabAssembler.XmlAttributeIsUseOriginalPLLineAssignments), DamMStabAssembler.XmlAttributeIsUseOriginalPLLineAssignments);
-            Assert.AreEqual(geometryCreationOptions.IsUseOriginalCalculationOptions, geometryCreationOptionsElement.AttributeAs<bool>(DamMStabAssembler.XmlAttributeIsUseOriginalCalculationOptions), DamMStabAssembler.XmlAttributeIsUseOriginalCalculationOptions);
             Assert.AreEqual(false, geometryCreationOptionsElement.AttributeAs<bool>(DamMStabAssembler.XmlAttributeIsDrySituation), DamMStabAssembler.XmlAttributeIsDrySituation);
             Assert.AreEqual(geometryCreationOptions.IsDesign, geometryCreationOptionsElement.AttributeAs<bool>(DamMStabAssembler.XmlAttributeIsDesign), DamMStabAssembler.XmlAttributeIsDesign);
             Assert.AreEqual(geometryCreationOptions.PlLineAssignment, geometryCreationOptionsElement.AttributeAs<PlLineAssignment>(DamMStabAssembler.XmlAttributePLLineAssignment), DamMStabAssembler.XmlAttributePLLineAssignment);
@@ -721,8 +717,6 @@
             Assert.AreEqual(1, element.Attributes(DamMStabAssembler.XmlAttributeXOffsetSoilGeometry2DOrigin).Count());
             Assert.AreEqual(1, element.Attributes(DamMStabAssembler.XmlAttributeMaterialForDike).Count());
             Assert.AreEqual(1, element.Attributes(DamMStabAssembler.XmlAttributeMaterialForShoulder).Count());
-            Assert.AreEqual(1, element.Attributes(DamMStabAssembler.XmlAttributeIsUseOriginalPLLineAssignments).Count());
-            Assert.AreEqual(1, element.Attributes(DamMStabAssembler.XmlAttributeIsUseOriginalCalculationOptions).Count());
             Assert.AreEqual(1, element.Attributes(DamMStabAssembler.XmlAttributeIsDrySituation).Count());
             Assert.AreEqual(1, element.Attributes(DamMStabAssembler.XmlAttributeIsDesign).Count());
         }
@@ -741,40 +735,6 @@
         }
 
         /// <summary>
-        /// IsUseOriginalPLLineAssignments test
-        /// The key value pair for the attribute should be: IsUseOriginalPLLineAssignments="true" 
-        /// </summary>
-        [Test]
-        public void VerifyThatTheAssemblerCorrectlyWritesTheIsUseOriginalPLLineAssignmentsAttributeValueWhenSetToTrue()
-        {
-            assembler = new DamMStabAssembler();
-            damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPlLineAssignments = true;
-            var doc = assembler.CreateDataTransferObject(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab);
-            var modelElement = doc.GetFirstOrDefaultElementByLocalName(DamMStabAssembler.XmlElementGeometryCreationOptions);
-            Assert.IsNotNull(modelElement);
-
-            const string expectedValue = "true";
-            Assert.AreEqual(expectedValue, modelElement.AttributeAs<string>(DamMStabAssembler.XmlAttributeIsUseOriginalPLLineAssignments));
-        }
-
-        /// <summary>
-        /// IsUseOriginalCalculationOptions test
-        /// The key value pair for the attribute should be: IsUseOriginalCalculationOptions="true" 
-        /// </summary>
-        [Test]
-        public void VerifyThatTheAssemblerCorrectlyWritesTheIsUseOriginalCalculationOptionsAttributeValueWhenSetToTrue()
-        {
-            assembler = new DamMStabAssembler();
-            damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalCalculationOptions = true;
-            var doc = assembler.CreateDataTransferObject(damFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab);
-            var modelElement = doc.GetFirstOrDefaultElementByLocalName(DamMStabAssembler.XmlElementGeometryCreationOptions);
-            Assert.IsNotNull(modelElement);
-
-            const string expectedValue = "true";
-            Assert.AreEqual(expectedValue, modelElement.AttributeAs<string>(DamMStabAssembler.XmlAttributeIsUseOriginalCalculationOptions));
-        }
-
-        /// <summary>
         /// IsDesign test
         /// The key value pair for the attribute should be: IsDesign="true" 
         /// </summary>
Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r2405 -r2494
--- DamEngine/trunk/xsd/DamLocation.xsd	(.../DamLocation.xsd)	(revision 2405)
+++ DamEngine/trunk/xsd/DamLocation.xsd	(.../DamLocation.xsd)	(revision 2494)
@@ -89,7 +89,6 @@
       <xs:element name="General">
         <xs:complexType>
           <xs:attribute name="Description" type="xs:string" />
-          <xs:attribute name="IsUseOriginalPLLineAssignments" type="xs:boolean" />
           <xs:attribute name="HeadPL2" type="xs:double" use="optional" />
           <xs:attribute name="HeadPL3" type="xs:double" use="optional" />
           <xs:attribute name="HeadPL4" type="xs:double" use="optional" />
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/test.xml
===================================================================
diff -u -r2310 -r2494
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/test.xml	(.../test.xml)	(revision 2310)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/test.xml	(.../test.xml)	(revision 2494)
@@ -96,7 +96,7 @@
     <tnsb:Model CalculationModel="Bishop" ShearStrength="CPhi" Probabilistic="false" SearchMethod="Grid" GridPosition="right" />
     <tnsb:TrafficLoad XCoordinateAtRiver="39.67" XCoordinateAtPolder="42.17" Load="13" DegreeOfConsolidationSpecified="true" DegreeOfConsolidation="0.495" />
     <tnsb:CalculationOptions MinimalCircleDepth="1.5" ZonesType="NoZones" />
-    <tnsb:GeometryCreationOptions SoilGeometryType="SoilGeometry2D" SoilGeometry2DFilename="D:\src\dam\dam engine\trunk\data\DAM Tutorial Design\DAM Tutorial Design.geometries2D.0\DWP_1.sti" XOffsetSoilGeometry2DOrigin="8.42" MaterialForDike="dijksmateriaal_klei" MaterialForShoulder="bermmateriaal_klei" IsUseOriginalPLLineAssignments="false" IsUseOriginalCalculationOptions="false" IsDrySituation="false" PLLineAssignment="ExpertKnowledge" IntrusionVerticalWaterPressure="Standard" PenetrationLength="0" IsDesign="false" />
+    <tnsb:GeometryCreationOptions SoilGeometryType="SoilGeometry2D" SoilGeometry2DFilename="D:\src\dam\dam engine\trunk\data\DAM Tutorial Design\DAM Tutorial Design.geometries2D.0\DWP_1.sti" XOffsetSoilGeometry2DOrigin="8.42" MaterialForDike="dijksmateriaal_klei" MaterialForShoulder="bermmateriaal_klei" IsDrySituation="false" PLLineAssignment="ExpertKnowledge" IntrusionVerticalWaterPressure="Standard" PenetrationLength="0" IsDesign="false" />
     <tnsb:HorizontalBalanceArea XLeft="0" XRight="0" YTop="0" YBottom="0" PlaneCount="0" />
     <tnsb:SlipCircleDefinition XCoordinateLastUpliftPoint="0" UpliftVanTangentLinesDefinition="OnBoundaryLines" UpliftVanTangentLinesDistance="0.25" BishopTangentLinesDefinition="OnBoundaryLines" BishopTangentLinesDistance="0.25" GridSizeDetermination="Automatic" UpliftVanLeftGridVerticalPointCount="36" UpliftVanLeftGridVerticalPointDistance="2" UpliftVanLeftGridHorizontalPointCount="14" UpliftVanLeftGridHorizontalPointDistance="2" UpliftVanRightGridVerticalPointCount="3" UpliftVanRightGridVerticalPointDistance="2" UpliftVanRightGridHorizontalPointCount="6" UpliftVanRightGridHorizontalPointDistance="2" BishopGridVerticalPointCount="36" BishopGridVerticalPointDistance="2" BishopGridHorizontalPointCount="14" BishopGridHorizontalPointDistance="2" />
   </tns:DamMStabInput>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs
===================================================================
diff -u -r2227 -r2494
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs	(.../MStabParameters.cs)	(revision 2227)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs	(.../MStabParameters.cs)	(revision 2494)
@@ -365,8 +365,6 @@
             XOffsetSoilGeometry2DOrigin = 0.0;
             MaterialForDike = "";
             MaterialForShoulder = "";
-            IsUseOriginalPlLineAssignments = false;
-            IsUseOriginalCalculationOptions = false;
             PlLineAssignment = PlLineAssignment.ExpertKnowledge;
             IntrusionVerticalWaterPressureType = IntrusionVerticalWaterPressureType.Standard;
             PenetrationLength = 0.0;
@@ -377,9 +375,6 @@
         public double XOffsetSoilGeometry2DOrigin { get; set; }
         public string MaterialForDike { get; set; }
         public string MaterialForShoulder { get; set; }
-        public bool IsUseOriginalPlLineAssignments { get; set; }
-        public bool IsUseOriginalCalculationOptions { get; set; }
-        
         public PlLineAssignment PlLineAssignment { get; set; }
         public IntrusionVerticalWaterPressureType IntrusionVerticalWaterPressureType { get; set; }
         public double PenetrationLength { get; set; }
@@ -392,8 +387,6 @@
             this.XOffsetSoilGeometry2DOrigin = mstabGeometryCreationOptions.XOffsetSoilGeometry2DOrigin;
             this.MaterialForDike = mstabGeometryCreationOptions.MaterialForDike;
             this.MaterialForShoulder = mstabGeometryCreationOptions.MaterialForShoulder;
-            this.IsUseOriginalPlLineAssignments = mstabGeometryCreationOptions.IsUseOriginalPlLineAssignments;
-            this.IsUseOriginalCalculationOptions = mstabGeometryCreationOptions.IsUseOriginalCalculationOptions;
             this.PlLineAssignment = mstabGeometryCreationOptions.PlLineAssignment;
             this.IntrusionVerticalWaterPressureType = mstabGeometryCreationOptions.IntrusionVerticalWaterPressureType;
             this.PenetrationLength = mstabGeometryCreationOptions.PenetrationLength;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs
===================================================================
diff -u -r1974 -r2494
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs	(.../ModelParameters.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/ModelParameters.cs	(.../ModelParameters.cs)	(revision 2494)
@@ -26,15 +26,11 @@
     public class ModelParameters
     {
         public double TrafficLoad { get; set; }  // moved to location
-        public double MinimalCircleDepth { get; set; } // to be moved to location
-        public double LevelReductionInside { get; set; } // not used yet; to be moved to location
-        public double LevelReductionOutside { get; set; } // not used yet; to be moved to location
+        
         public string MapForSoilGeometries2D { get; set; } // ??? 
         public ModelParametersForPlLines ModelParametersForPlLines { get; set; } // to be moved to location
         public ModelFactors ModelFactors { get; set; } // to be moved to location
-        public DistributionType LayerHeightDistribution { get; set; } // to be moved to location
-        public double LayerHeightDeviation { get; set; } // to be moved to location
-
+        
         public ModelParameters()
         {
             ModelParametersForPlLines = new ModelParametersForPlLines();
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
===================================================================
diff -u -r2231 -r2494
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 2231)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 2494)
@@ -93,7 +93,6 @@
                 location.DikeEmbankmentMaterial;
             failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder =
                 location.ShoulderEmbankmentMaterial;
-            failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsUseOriginalPlLineAssignments = false;
             failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.IsDesign =
                 (embankmentDesignParameters != null);
             failureMechanismParametersMStab.MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin =
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs
===================================================================
diff -u -r2463 -r2494
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs	(.../DamMStabAssembler.cs)	(revision 2463)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/Assemblers/DamMStabAssembler.cs	(.../DamMStabAssembler.cs)	(revision 2494)
@@ -137,8 +137,6 @@
         public const string XmlAttributeXOffsetSoilGeometry2DOrigin = "XOffsetSoilGeometry2DOrigin";
         public const string XmlAttributeMaterialForDike = "MaterialForDike";
         public const string XmlAttributeMaterialForShoulder = "MaterialForShoulder";
-        public const string XmlAttributeIsUseOriginalPLLineAssignments = "IsUseOriginalPLLineAssignments";
-        public const string XmlAttributeIsUseOriginalCalculationOptions = "IsUseOriginalCalculationOptions";
         public const string XmlAttributeIsDrySituation = "IsDrySituation";
         public const string XmlAttributePLLineAssignment = "PLLineAssignment";
         public const string XmlAttributeIntrusionVerticalWaterPressure = "IntrusionVerticalWaterPressure";
@@ -585,10 +583,6 @@
                                     MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin),
                 new XAttribute(XmlAttributeMaterialForDike, materialForDike),
                 new XAttribute(XmlAttributeMaterialForShoulder, materialForShoulder),
-                new XAttribute(XmlAttributeIsUseOriginalPLLineAssignments, failureMechanismParametersMStab.
-                                    MStabParameters.GeometryCreationOptions.IsUseOriginalPlLineAssignments),
-                new XAttribute(XmlAttributeIsUseOriginalCalculationOptions, failureMechanismParametersMStab.
-                                    MStabParameters.GeometryCreationOptions.IsUseOriginalCalculationOptions),
                 new XAttribute(XmlAttributeIsDrySituation, false),
                 new XAttribute(XmlAttributePLLineAssignment, failureMechanismParametersMStab.
                                     MStabParameters.GeometryCreationOptions.PlLineAssignment),
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r2405 -r2494
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2405)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2494)
@@ -3594,10 +3594,6 @@
         
         private string descriptionField;
         
-        private bool isUseOriginalPLLineAssignmentsField;
-        
-        private bool isUseOriginalPLLineAssignmentsFieldSpecified;
-        
         private double headPL2Field;
         
         private bool headPL2FieldSpecified;
@@ -3623,28 +3619,6 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public bool IsUseOriginalPLLineAssignments {
-            get {
-                return this.isUseOriginalPLLineAssignmentsField;
-            }
-            set {
-                this.isUseOriginalPLLineAssignmentsField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool IsUseOriginalPLLineAssignmentsSpecified {
-            get {
-                return this.isUseOriginalPLLineAssignmentsFieldSpecified;
-            }
-            set {
-                this.isUseOriginalPLLineAssignmentsFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
         public double HeadPL2 {
             get {
                 return this.headPL2Field;