Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r2422 -r2447
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 2422)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 2447)
@@ -93,8 +93,6 @@
         public const string RequiredProbabilityOfFailureStabilityInnerslope = "RequiredProbabilityOfFailureStabilityInnerslope";
         public const string RequiredProbabilityOfFailureStabilityOuterslope = "RequiredProbabilityOfFailureStabilityOuterslope";
         public const string RequiredProbabilityOfFailurePiping = "RequiredProbabilityOfFailurePiping";
-        public const string UpliftCriterionPiping = "UpliftCriterionPiping";
-        public const string UpliftCriterionStability = "UpliftCriterionStability";
         public const string StabilityZoneType = "StabilityZoneType";
         public const string ForbiddenZoneFactor = "ForbiddenZoneFactor";
         public const string ZoneAreaRestSlopeCrestWidth = "ZoneAreaRestSlopeCrestWidth";
@@ -647,44 +645,6 @@
             }
         }
 
-        [XmlIgnore]
-        [Label("Uplift criterion stability")]
-        [Description("Uplift criterion that is used in stability calulation")]
-        [Unit(UnitType.None)]
-        [Format("F3")]
-        [PropertyOrder(6, 1)]
-        [Category(WaterCategory)]
-        public virtual double? UpliftCriterionStability
-        {
-            get
-            {
-                return ModelFactors.UpliftCriterionStability;
-            }
-            set
-            {
-                ModelFactors.UpliftCriterionStability = value;
-            }
-        }
-
-        [XmlIgnore]
-        [Label("Uplift criterion piping")]
-        [Description("Uplift criterion that is used in piping calulation")]
-        [Unit(UnitType.None)]
-        [Format("F3")]
-        [PropertyOrder(6, 2)]
-        [Category(WaterCategory)]
-        public virtual double? UpliftCriterionPiping
-        {
-            get
-            {
-                return ModelFactors.UpliftCriterionPiping;
-            }
-            set
-            {
-                ModelFactors.UpliftCriterionPiping = value;
-            }
-        }
-
         [Label("Layer height distribution")]
         [Category(AllCategory)]
         [PropertyOrder(4, 7)]
@@ -2423,14 +2383,6 @@
             {
                 nameValuePairs.Add(LocationParameterNames.RequiredProbabilityOfFailurePiping, ModelFactors.RequiredProbabilityOfFailurePiping.Value.ToString(numberFormatInfo));
             }
-            if (ModelFactors.UpliftCriterionPiping != null)
-            {
-                nameValuePairs.Add(LocationParameterNames.UpliftCriterionPiping, ModelFactors.UpliftCriterionPiping.Value.ToString(numberFormatInfo));
-            }
-            if (ModelFactors.UpliftCriterionStability != null)
-            {
-                nameValuePairs.Add(LocationParameterNames.UpliftCriterionStability, ModelFactors.UpliftCriterionStability.Value.ToString(numberFormatInfo));
-            }
             nameValuePairs.Add(LocationParameterNames.StabilityZoneType, StabilityZoneType.ToString());
             nameValuePairs.Add(LocationParameterNames.ForbiddenZoneFactor, ForbiddenZoneFactor.ToString(numberFormatInfo));
             nameValuePairs.Add(LocationParameterNames.ZoneAreaRestSlopeCrestWidth, ZoneAreaRestSlopeCrestWidth.ToString(numberFormatInfo));
@@ -2887,14 +2839,6 @@
             {
                 ModelFactors.RequiredProbabilityOfFailurePiping = Convert.ToDouble(parameterValue, numberFormatInfo);
             }
-            if (parameterName.Equals(LocationParameterNames.UpliftCriterionPiping))
-            {
-                ModelFactors.UpliftCriterionPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
-            }
-            if (parameterName.Equals(LocationParameterNames.UpliftCriterionStability))
-            {
-                ModelFactors.UpliftCriterionStability = Convert.ToDouble(parameterValue, numberFormatInfo);
-            }
             if (parameterName.Equals(LocationParameterNames.StabilityZoneType))
             {
                 StabilityZoneType = (MStabZonesType) Enum.Parse(typeof(MStabZonesType), parameterValue);
@@ -3058,10 +3002,6 @@
                     return isDesign;
                 case "StabilitySlopeAdaptionDeltaX":
                     return isDesign;
-                case "UpliftCriterionStability":
-                    return !isDesign;
-                case "UpliftCriterionPiping":
-                    return !isDesign;
                 case "PlLineOffsetBelowDikeToeAtPolder":
                     return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded;
                 case "PlLineOffsetBelowDikeTopAtPolder":