Index: DamEngine/trunk/xsd/DamLocation.xsd
===================================================================
diff -u -r2517 -r2522
--- DamEngine/trunk/xsd/DamLocation.xsd	(.../DamLocation.xsd)	(revision 2517)
+++ DamEngine/trunk/xsd/DamLocation.xsd	(.../DamLocation.xsd)	(revision 2522)
@@ -133,15 +133,6 @@
           <xs:attribute name="TrafficLoadDegreeOfConsolidation" type="xs:double" use="optional" />
         </xs:complexType>
       </xs:element>
-      <xs:element minOccurs="0" maxOccurs="1" name="ModelFactors">
-        <xs:complexType>
-          <xs:attribute name="RequiredSafetyFactorStabilityInnerSlope" type="xs:double" use="optional" />
-          <xs:attribute name="RequiredSafetyFactorStabilityOuterSlope" type="xs:double" use="optional" />
-          <xs:attribute name="RequiredSafetyFactorPiping" type="xs:double" use="optional" />
-          <xs:attribute name="UpliftCriterionPiping" type="xs:double" use="optional" />
-          <xs:attribute name="UpliftCriterionStability" type="xs:double" use="optional" />
-        </xs:complexType>
-      </xs:element>
     </xs:sequence>
     <xs:attribute name="SurfaceLineName" type="xs:string" use="required" />
     <xs:attribute name="SegmentName" type="xs:string" use="required" />
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r2517 -r2522
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 2517)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 2522)
@@ -611,18 +611,6 @@
                         location.StabilityOptions.MinimalCircleDepth = inputLocation.StabilityOptions.MinimumCircleDepth;
                     }
                 }
-                // Modelfactors
-                var modelFactors = inputLocation.ModelFactors;
-                if (modelFactors != null)
-                {
-                    location.ModelFactors = new ModelFactors();
-                    location.ModelFactors.RequiredSafetyFactorPiping = (modelFactors.RequiredSafetyFactorPipingSpecified ? (double?)modelFactors.RequiredSafetyFactorPiping : null);
-                    location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = (modelFactors.RequiredSafetyFactorStabilityInnerSlopeSpecified ? (double?)modelFactors.RequiredSafetyFactorStabilityInnerSlope : null);
-                    location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = (modelFactors.RequiredSafetyFactorStabilityOuterSlopeSpecified ? (double?)modelFactors.RequiredSafetyFactorStabilityOuterSlope : null);
-                    location.ModelFactors.UpliftCriterionPiping = (modelFactors.UpliftCriterionPipingSpecified ? (double?)modelFactors.UpliftCriterionPiping : null);
-                    location.ModelFactors.UpliftCriterionStability = (modelFactors.UpliftCriterionStabilitySpecified ? (double?)modelFactors.UpliftCriterionStability : null);
-                }
-
                 dikeLocations.Add(location);
             }
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r2517 -r2522
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 2517)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 2522)
@@ -631,22 +631,6 @@
                         inputLocation.StabilityOptions.MinimumCircleDepth = location.StabilityOptions.MinimalCircleDepth.Value;
                     }
                 }
-                // Modelfactors
-                if (location.ModelFactors != null)
-                {
-                    inputLocation.ModelFactors = new LocationModelFactors();
-                    inputLocation.ModelFactors.RequiredSafetyFactorPipingSpecified = location.ModelFactors.RequiredSafetyFactorPiping.HasValue;
-                    inputLocation.ModelFactors.RequiredSafetyFactorPiping = location.ModelFactors.RequiredSafetyFactorPiping ?? 0.0;
-                    inputLocation.ModelFactors.RequiredSafetyFactorStabilityInnerSlopeSpecified = location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope.HasValue;
-                    inputLocation.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope ?? 0.0;
-                    inputLocation.ModelFactors.RequiredSafetyFactorStabilityOuterSlopeSpecified = location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope.HasValue;
-                    inputLocation.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = location.ModelFactors.RequiredSafetyFactorStabilityOuterSlope ?? 0.0;
-                    inputLocation.ModelFactors.UpliftCriterionPipingSpecified = location.ModelFactors.UpliftCriterionPiping.HasValue;
-                    inputLocation.ModelFactors.UpliftCriterionPiping = location.ModelFactors.UpliftCriterionPiping ?? 0.0;
-                    inputLocation.ModelFactors.UpliftCriterionStabilitySpecified = location.ModelFactors.UpliftCriterionStability.HasValue;
-                    inputLocation.ModelFactors.UpliftCriterionStability = location.ModelFactors.UpliftCriterionStability ?? 0.0;
-                }
-
                 inputLocations[i] = inputLocation;
             }
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r2517 -r2522
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2517)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 2522)
@@ -330,8 +330,6 @@
         
         private LocationStabilityOptions stabilityOptionsField;
         
-        private LocationModelFactors modelFactorsField;
-        
         private string surfaceLineNameField;
         
         private string segmentNameField;
@@ -410,16 +408,6 @@
         }
         
         /// <remarks/>
-        public LocationModelFactors ModelFactors {
-            get {
-                return this.modelFactorsField;
-            }
-            set {
-                this.modelFactorsField = value;
-            }
-        }
-        
-        /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string SurfaceLineName {
             get {
@@ -4111,145 +4099,6 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class LocationModelFactors {
-        
-        private double requiredSafetyFactorStabilityInnerSlopeField;
-        
-        private bool requiredSafetyFactorStabilityInnerSlopeFieldSpecified;
-        
-        private double requiredSafetyFactorStabilityOuterSlopeField;
-        
-        private bool requiredSafetyFactorStabilityOuterSlopeFieldSpecified;
-        
-        private double requiredSafetyFactorPipingField;
-        
-        private bool requiredSafetyFactorPipingFieldSpecified;
-        
-        private double upliftCriterionPipingField;
-        
-        private bool upliftCriterionPipingFieldSpecified;
-        
-        private double upliftCriterionStabilityField;
-        
-        private bool upliftCriterionStabilityFieldSpecified;
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double RequiredSafetyFactorStabilityInnerSlope {
-            get {
-                return this.requiredSafetyFactorStabilityInnerSlopeField;
-            }
-            set {
-                this.requiredSafetyFactorStabilityInnerSlopeField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool RequiredSafetyFactorStabilityInnerSlopeSpecified {
-            get {
-                return this.requiredSafetyFactorStabilityInnerSlopeFieldSpecified;
-            }
-            set {
-                this.requiredSafetyFactorStabilityInnerSlopeFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double RequiredSafetyFactorStabilityOuterSlope {
-            get {
-                return this.requiredSafetyFactorStabilityOuterSlopeField;
-            }
-            set {
-                this.requiredSafetyFactorStabilityOuterSlopeField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool RequiredSafetyFactorStabilityOuterSlopeSpecified {
-            get {
-                return this.requiredSafetyFactorStabilityOuterSlopeFieldSpecified;
-            }
-            set {
-                this.requiredSafetyFactorStabilityOuterSlopeFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double RequiredSafetyFactorPiping {
-            get {
-                return this.requiredSafetyFactorPipingField;
-            }
-            set {
-                this.requiredSafetyFactorPipingField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool RequiredSafetyFactorPipingSpecified {
-            get {
-                return this.requiredSafetyFactorPipingFieldSpecified;
-            }
-            set {
-                this.requiredSafetyFactorPipingFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double UpliftCriterionPiping {
-            get {
-                return this.upliftCriterionPipingField;
-            }
-            set {
-                this.upliftCriterionPipingField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftCriterionPipingSpecified {
-            get {
-                return this.upliftCriterionPipingFieldSpecified;
-            }
-            set {
-                this.upliftCriterionPipingFieldSpecified = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlAttributeAttribute()]
-        public double UpliftCriterionStability {
-            get {
-                return this.upliftCriterionStabilityField;
-            }
-            set {
-                this.upliftCriterionStabilityField = value;
-            }
-        }
-        
-        /// <remarks/>
-        [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool UpliftCriterionStabilitySpecified {
-            get {
-                return this.upliftCriterionStabilityFieldSpecified;
-            }
-            set {
-                this.upliftCriterionStabilityFieldSpecified = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
     public partial class InputAquiferSoil {
         
         private string soilnameField;