Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/PredicateSpecification.cs
===================================================================
diff -u -r1974 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/PredicateSpecification.cs	(.../PredicateSpecification.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/PredicateSpecification.cs	(.../PredicateSpecification.cs)	(revision 2113)
@@ -46,7 +46,7 @@
         /// </returns>
         public override bool IsSatisfiedBy(T candidate)
         {
-            return this.predicate(candidate);
+            return predicate(candidate);
         }
 
         #endregion
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs
===================================================================
diff -u -r2111 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs	(.../MStabParameters.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs	(.../MStabParameters.cs)	(revision 2113)
@@ -19,24 +19,32 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.ComponentModel;
 using Deltares.DamEngine.Data.Standard;
 using Deltares.DamEngine.Data.Standard.Validation;
 
 namespace Deltares.DamEngine.Data.General
 {
+    /// <summary>
+    /// Types of tangent lines definitions.
+    /// </summary>
     public enum TangentLinesDefinition
     {
         OnBoundaryLines = 0,
         Specified = 1
     }
 
+    /// <summary>
+    /// Types of GridSize Determinations
+    /// </summary>
     public enum GridSizeDetermination
     {
         Automatic = 0,
         Specified = 1
     }
 
+    /// <summary>
+    /// Types of Intrusion Vertical Water Pressures
+    /// </summary>
     public enum IntrusionVerticalWaterPressureType
     {
         Standard,
@@ -46,6 +54,9 @@
         SemiTimeDependent
     }
 
+    /// <summary>
+    /// Types of MStab Shear Strength models
+    /// </summary>
     public enum MStabShearStrength
     {
         CPhi,
@@ -56,25 +67,37 @@
         Default
     }
 
+    /// <summary>
+    /// Types of MStab Search Methods
+    /// </summary>
     public enum MStabSearchMethod
     {
         Grid,
         GeneticAlgorithm
     }
 
+    /// <summary>
+    /// Types of MStab Grid Positions
+    /// </summary>
     public enum MStabGridPosition
     {
         Left,
         Right
     }
 
+    /// <summary>
+    /// Types of MStab Zones
+    /// </summary>
     public enum MStabZonesType
     {
         NoZones = 0,
         ZoneAreas = 1,
         ForbiddenZone = 2
     }
 
+    /// <summary>
+    /// Types of PlLine Assignments
+    /// </summary>
     public enum PlLineAssignment
     {
         NoPlLines,
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r2111 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 2113)
@@ -123,7 +123,7 @@
             foreach (var sensorLocation in sensorData.SensorLocations)
             {
                 var inputSensorLocation = new Io.XmlInput.SensorLocation();
-                inputSensorLocation.GroupId = sensorLocation.GroupID;
+                inputSensorLocation.GroupId = sensorLocation.GroupId;
                 inputSensorLocation.LocationId = sensorLocation.LocationName;
                 inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder);
                 inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/LessThanOrEqualToSpecification.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/PipingResults.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r2111 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 2113)
@@ -44,15 +44,12 @@
     <Compile Include="General\Physics.cs" />
     <Compile Include="General\Results\DesignResult.cs" />
     <Compile Include="Design\DesignScenario.cs" />
-    <Compile Include="General\CompositeJob.cs" />
     <Compile Include="General\DAMEnumerations.cs" />
     <Compile Include="General\DamFailureMechanismeCalculationSpecification.cs" />
     <Compile Include="General\DamGlobalConstants.cs" />
-    <Compile Include="General\DamJob.cs" />
     <Compile Include="General\DamProjectCalculationSpecification.cs" />
     <Compile Include="General\DamProjectData.cs" />
     <Compile Include="General\Dike.cs" />
-    <Compile Include="General\DikeJob.cs" />
     <Compile Include="General\FailureMechanismParametersMStab.cs" />
     <Compile Include="General\Gauges\Gauge.cs" />
     <Compile Include="General\Gauges\GaugePLLine.cs" />
@@ -65,7 +62,6 @@
     <Compile Include="General\PlLines\PlLines.cs" />
     <Compile Include="General\PolyLine.cs" />
     <Compile Include="General\Results\PipingDesignResults.cs" />
-    <Compile Include="General\Results\PipingResults.cs" />
     <Compile Include="General\Results\StabilityDesignResults.cs" />
     <Compile Include="General\Results\StabilityResultTypes.cs" />
     <Compile Include="General\Segment.cs" />
@@ -87,18 +83,11 @@
     <Compile Include="General\Specifications\AndSpecification.cs" />
     <Compile Include="General\Specifications\CompositeSpecification.cs" />
     <Compile Include="General\Specifications\Extensions\SpecificationExtensions.cs" />
-    <Compile Include="General\Specifications\GreaterThanOrEqualToSpecification.cs" />
     <Compile Include="General\Specifications\ISpecification.cs" />
-    <Compile Include="General\Specifications\LessThanOrEqualToSpecification.cs" />
-    <Compile Include="General\Specifications\MaximumAttribute.cs" />
-    <Compile Include="General\Specifications\MinimumAttribute.cs" />
     <Compile Include="General\Specifications\NotSpecification.cs" />
     <Compile Include="General\Specifications\OrSpecification.cs" />
     <Compile Include="General\Specifications\PredicateSpecification.cs" />
     <Compile Include="General\Specifications\SpecificationBase.cs" />
-    <Compile Include="General\Specifications\SpecificationBaseAttribute.cs" />
-    <Compile Include="General\Specifications\ValidationException.cs" />
-    <Compile Include="General\Specifications\ValueBoundSpecification.cs" />
     <Compile Include="General\StabilityOptions.cs" />
     <Compile Include="General\TimeSeries\Stochast.cs" />
     <Compile Include="General\TimeSeries\TimeSerie.cs" />
@@ -137,7 +126,6 @@
     <Compile Include="Geotechnics\PreConsolidationStress.cs" />
     <Compile Include="Geotechnics\ShearStrengthModel.cs" />
     <Compile Include="General\Location.cs" />
-    <Compile Include="General\LocationJob.cs" />
     <Compile Include="Geotechnics\SoilLayer.cs" />
     <Compile Include="Geotechnics\SoilLayer1D.cs" />
     <Compile Include="Geotechnics\SoilLayer2D.cs" />
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/AndSpecification.cs
===================================================================
diff -u -r1974 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/AndSpecification.cs	(.../AndSpecification.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/AndSpecification.cs	(.../AndSpecification.cs)	(revision 2113)
@@ -45,7 +45,7 @@
         /// </returns>
         public override bool IsSatisfiedBy(TCandidate candidate)
         {
-            bool satisfied = (this.one.IsSatisfiedBy(candidate) && this.other.IsSatisfiedBy(candidate));
+            bool satisfied = (one.IsSatisfiedBy(candidate) && other.IsSatisfiedBy(candidate));
             if (!satisfied)
             {
                 base.Description = this.Description;
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/MaximumAttribute.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r2111 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 2113)
@@ -208,19 +208,6 @@
         }
 
         /// <summary>
-        /// Clones this instance.
-        /// </summary>
-        /// <returns></returns>
-        public DamFailureMechanismeCalculationSpecification Clone()
-        {
-            DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculation = new DamFailureMechanismeCalculationSpecification();
-
-            damFailureMechanismeCalculation.Assign(this);
-
-            return damFailureMechanismeCalculation;
-        }
-
-        /// <summary>
         /// Returns a <see cref="System.String" /> that represents this instance.
         /// </summary>
         /// <returns>
@@ -238,23 +225,6 @@
             }
 
             return description;
-        }
-
-        /// <summary>
-        /// Determines whether slip circle definition is undefined.
-        /// </summary>
-        /// <returns>
-        ///   <c>true</c> if [is slip circle definition undefined]; otherwise, <c>false</c>.
-        /// </returns>
-        public bool IsSlipCircleDefinitionUndefined()
-        {
-            bool isSlipCircleDefinitionUndefined = (failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition == null);
-            if (!isSlipCircleDefinitionUndefined)
-            {
-                isSlipCircleDefinitionUndefined = (failureMechanismParametersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount == 0);
-            }
-            return isSlipCircleDefinitionUndefined;
-        }
-
+        }        
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs
===================================================================
diff -u -r1974 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 2113)
@@ -23,10 +23,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Globalization;
-using System.Linq.Expressions;
 using Deltares.DamEngine.Data.General;
-using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Language;
@@ -36,56 +33,13 @@
 {
 
     /// <summary>
-    /// Exception class for DesignScenario
-    /// </summary>
-    /// <seealso cref="System.Exception" />
-    [Serializable]
-    public class DesignScenarioException : Exception
-    {
-        public DesignScenarioException(string message) : base(message)
-        {
-        }
-    }
-
-    /// <summary>
     /// Calculation scenario class
     /// </summary>
     public class DesignScenario
     {
-        #region Performance optimization: Extract expression so it only has to be generated once.
-
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionLocationScenarioId = x => x.LocationScenarioID;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionRiverLevel = x => x.RiverLevel;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionRiverLevelLow = x => x.RiverLevelLow;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionDikeTableHeight = x => x.DikeTableHeight;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionRequiredSafetyFactorStabilityInnerSlope = x => x.RequiredSafetyFactorStabilityInnerSlope;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionRequiredSafetyFactorStabilityOuterSlope = x => x.RequiredSafetyFactorStabilityOuterSlope;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionRequiredSafetyFactorPiping = x => x.RequiredSafetyFactorPiping;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionUpliftCriterionPiping = x => x.UpliftCriterionPiping;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionUpliftCriterionStability = x => x.UpliftCriterionStability;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowDikeTopAtRiver = x => x.PlLineOffsetBelowDikeTopAtRiver;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowDikeTopAtPolder = x => x.PlLineOffsetBelowDikeTopAtPolder;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowShoulderBaseInside = x => x.PlLineOffsetBelowShoulderBaseInside;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowDikeToeAtPolder = x => x.PlLineOffsetBelowDikeToeAtPolder;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionUsePlLineOffsetBelowDikeCrestMiddle = x => x.UsePlLineOffsetBelowDikeCrestMiddle;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowDikeCrestMiddle = x => x.PlLineOffsetBelowDikeCrestMiddle;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionUsePlLineOffsetFactorBelowShoulderCrest = x => x.UsePlLineOffsetFactorBelowShoulderCrest;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetFactorBelowShoulderCrest = x => x.PlLineOffsetFactorBelowShoulderCrest;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionHeadPl3 = x => x.HeadPl3;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionHeadPl4 = x => x.HeadPl4;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionWaterHeightDecimeringsHoogte = x => x.WaterHeightDecimeringsHoogte;
-        private static readonly Expression<Func<DesignScenario, object>> ExpressionMaxWaterLevel = x => x.MaxWaterLevel;
-
-        #endregion
-
         private CalculationResult calculationResult = CalculationResult.NoRun;
-        private Location location = null;
-        private readonly List<DesignResult> calculationResults = new List<DesignResult>();
-
-        private Dictionary<Object, UpliftSituation?> stabilityUpliftSituations;
-        private Dictionary<Object, PipingResults?> pipingResults;
-        private Dictionary<Object, MStabResults?> mStabResults;
-        private Dictionary<Object, double?> safetyFactorsPiping;
+        private Location location;
+        
         private Dictionary<Object, SurfaceLine2> redesignedSurfaceLines;
         private Dictionary<Object, string> resultMessages;
 
@@ -112,31 +66,17 @@
             set { calculationResult = value; }
         }
 
-        public List<DesignResult> CalculationResults
-        {
-            get { return calculationResults; }
-        }
-
         /// <summary>
         /// Constructor
         /// </summary>
         public DesignScenario()
         {
             ClearResults();
-            ClearErrors();
-            ClearstabilityUpliftSituations();
+            ClearErrors();        
             ModelFactors = new ModelFactors();
         }
 
         /// <summary>
-        /// Clears the results
-        /// </summary>
-        public void ClearstabilityUpliftSituations()
-        {
-            stabilityUpliftSituations = new Dictionary<Object, UpliftSituation?>();
-        }
-
-        /// <summary>
         /// Clears the errors.
         /// </summary>
         public void ClearErrors()
@@ -150,12 +90,8 @@
         public void ClearResults()
         {
             calculationResult = CalculationResult.NoRun;
-            pipingResults = new Dictionary<Object, PipingResults?>();
-            mStabResults = new Dictionary<Object, MStabResults?>();
-            safetyFactorsPiping = new Dictionary<Object, double?>();
             resultMessages = new Dictionary<Object, string>();
-            redesignedSurfaceLines = new Dictionary<Object, SurfaceLine2>();
-            calculationResults.Clear();
+            redesignedSurfaceLines = new Dictionary<Object, SurfaceLine2>();            
         }
 
         /// <summary>
@@ -536,50 +472,6 @@
         }
 
         /// <summary>
-        /// Get uplift criterion for this scenario; return default value if not available
-        /// </summary>
-        /// <param name="defaultUpliftCriterionStability">default value if not available</param>
-        /// <returns>uplift criterion for this scenario</returns>
-        public double GetUpliftCriterionStability(double? defaultUpliftCriterionStability)
-        {
-            if ((defaultUpliftCriterionStability == null) && (ModelFactors.UpliftCriterionStability == null))
-            {
-                throw new DesignScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForStability"), Location.Name, ToString()));
-
-            }
-            return (ModelFactors.UpliftCriterionStability == null ? defaultUpliftCriterionStability.Value
-                        : ModelFactors.UpliftCriterionStability.Value);
-        }
-
-        /// <summary>
-        /// Get uplift criterion for this scenario; return default value if not available
-        /// </summary>
-        /// <param name="defaultUpliftCriterionPiping">default value if not available</param>
-        /// <returns>uplift criterion for this scenario</returns>
-        public double GetUpliftCriterionPiping(double? defaultUpliftCriterionPiping)
-        {
-            if ((defaultUpliftCriterionPiping == null) && (ModelFactors.UpliftCriterionPiping == null))
-            {
-                throw new DesignScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForPiping"), Location.Name, ToString()));
-            }
-            return (ModelFactors.UpliftCriterionPiping == null ? defaultUpliftCriterionPiping.Value : ModelFactors.UpliftCriterionPiping.Value);
-        }
-
-        /// <summary>
-        /// Get required safety factor for this scenario; return default value if not available
-        /// </summary>
-        /// <param name="defaultRequiredSafetyFactorPiping">default value if not available</param>
-        /// <returns>uplift criterion for this scenario</returns>
-        public double GetRequiredSafetyFactorPiping(double? defaultRequiredSafetyFactorPiping)
-        {
-            if ((defaultRequiredSafetyFactorPiping == null) && (ModelFactors.RequiredSafetyFactorPiping == null))
-            {
-                throw new DesignScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyFactorPiping"), Location.Name, ToString()));
-            }
-            return (ModelFactors.RequiredSafetyFactorPiping == null ? defaultRequiredSafetyFactorPiping.Value : ModelFactors.RequiredSafetyFactorPiping.Value);
-        }
-
-        /// <summary>
         /// Determines whether [is pl line offset factor below shoulder crest valid].
         /// </summary>
         /// <returns></returns>
@@ -610,196 +502,8 @@
             }
             return new ValidationResult[0];
         }
-
+        
         /// <summary>
-        /// Get stability uplift situation
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <returns></returns>
-        private UpliftSituation? GetStabilityUpliftSituation(Object objectAsKey)
-        {
-            return objectAsKey != null && stabilityUpliftSituations.ContainsKey(objectAsKey) ? stabilityUpliftSituations[objectAsKey] : null;
-        }
-
-        /// <summary>
-        /// Get stability uplift situation
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <returns></returns>
-        public UpliftSituation? GetStabilityUpliftSituation(SoilProfile1D soilProfile, string soilGeometry2DName)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            return GetStabilityUpliftSituation(objectAsKey);
-        }
-
-        /// <summary>
-        ///  Set stability uplift situation
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <param name="upliftSituation"></param>
-        private void SetStabilityUpliftSituation(Object objectAsKey, UpliftSituation upliftSituation)
-        {
-            stabilityUpliftSituations[objectAsKey] = upliftSituation;
-        }
-
-        /// <summary>
-        /// Set stability uplift situation
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <param name="upliftSituation"></param>
-        public void SetStabilityUpliftSituation(SoilProfile1D soilProfile, string soilGeometry2DName, UpliftSituation upliftSituation)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            SetStabilityUpliftSituation(objectAsKey, upliftSituation);
-        }
-
-        /// <summary>
-        /// Get PipingResults
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <returns></returns>
-        private PipingResults? GetPipingResults(Object objectAsKey)
-        {
-            if (objectAsKey != null)
-            {
-                return pipingResults.ContainsKey(objectAsKey) ? pipingResults[objectAsKey] : null;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Get PipingResults
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <returns></returns>
-        public PipingResults? GetPipingResults(SoilProfile1D soilProfile, string soilGeometry2DName)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            return GetPipingResults(objectAsKey);
-        }
-
-        /// <summary>
-        /// Set PipingResults
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <param name="pipingResults"></param>
-        private void SetPipingResults(Object objectAsKey, PipingResults? pipingResults)
-        {
-            this.pipingResults[objectAsKey] = pipingResults;
-        }
-
-        /// <summary>
-        /// Set PipingResults
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <param name="pipingResults"></param>
-        public void SetPipingResults(SoilProfile1D soilProfile, string soilGeometry2DName, PipingResults? pipingResults)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            SetPipingResults(objectAsKey, pipingResults);
-        }
-
-        /// <summary>
-        /// Get MStabResults
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <returns></returns>
-        private MStabResults? GetMStabResults(Object objectAsKey)
-        {
-            if (objectAsKey != null)
-            {
-                return mStabResults.ContainsKey(objectAsKey) ? mStabResults[objectAsKey] : null;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Get MStabResults
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <returns></returns>
-        public MStabResults? GetMStabResults(SoilProfile1D soilProfile, string soilGeometry2DName)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            return GetMStabResults(objectAsKey);
-        }
-
-        /// <summary>
-        /// Set MStabResults
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <param name="mStabResults"></param>
-        private void SetMStabResults(Object objectAsKey, MStabResults? mStabResults)
-        {
-            this.mStabResults[objectAsKey] = mStabResults;
-        }
-
-        /// <summary>
-        /// Set MStabResults
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <param name="mStabResults"></param>
-        public void SetMStabResults(SoilProfile1D soilProfile, string soilGeometry2DName, MStabResults? mStabResults)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            SetMStabResults(objectAsKey, mStabResults);
-        }
-
-        /// <summary>
-        /// Get Safety Factor Piping
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <returns></returns>
-        private double? GetSafetyFactorPiping(Object objectAsKey)
-        {
-            if (objectAsKey != null)
-            {
-                return safetyFactorsPiping.ContainsKey(objectAsKey) ? safetyFactorsPiping[objectAsKey] : null;
-            }
-            return null;
-        }
-
-        /// <summary>
-        ///  Get Safety Factor Piping
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <returns></returns>
-        public double? GetSafetyFactorPiping(SoilProfile1D soilProfile, string soilGeometry2DName)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            return GetSafetyFactorPiping(objectAsKey);
-        }
-
-        /// <summary>
-        ///  Set Safety Factor Piping
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <param name="safetyFactor"></param>
-        private void SetSafetyFactorPiping(Object objectAsKey, double? safetyFactor)
-        {
-            safetyFactorsPiping[objectAsKey] = safetyFactor;
-        }
-
-        /// <summary>
-        /// Set Safety Factor Piping
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <param name="safetyFactor"></param>
-        public void SetSafetyFactorPiping(SoilProfile1D soilProfile, string soilGeometry2DName, double? safetyFactor)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            SetSafetyFactorPiping(objectAsKey, safetyFactor);
-        }
-
-        /// <summary>
         /// Get Result Message
         /// </summary>
         /// <param name="objectAsKey"></param>
@@ -848,32 +552,6 @@
         }
 
         /// <summary>
-        /// Get Redesigned surfaceline
-        /// </summary>
-        /// <param name="objectAsKey"></param>
-        /// <returns></returns>
-        private SurfaceLine2 GetRedesignedSurfaceLine(Object objectAsKey)
-        {
-            if (objectAsKey != null)
-            {
-                return redesignedSurfaceLines.ContainsKey(objectAsKey) ? redesignedSurfaceLines[objectAsKey] : null;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Get Redesigned surfaceline
-        /// </summary>
-        /// <param name="soilProfile"></param>
-        /// <param name="soilGeometry2DName"></param>
-        /// <returns></returns>
-        public SurfaceLine2 GetRedesignedSurfaceLine(SoilProfile1D soilProfile, string soilGeometry2DName)
-        {
-            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
-            return GetRedesignedSurfaceLine(objectAsKey);
-        }
-
-        /// <summary>
         /// Set Redesigned surfaceline
         /// </summary>
         /// <param name="objectAsKey"></param>
@@ -955,8 +633,26 @@
         /// <returns></returns>
         public override string ToString()
         {
-            return String.Format("Location={0}, ID={1} RiverLevel={2} RiverLevelLow={3} DikeTableHeight={4} SafetyFactorStabilityInnerSlope={5} RequiredSafetyFactorStabilityOuterSlope={6} WaterHeightDecimeringsHoogte= {7} MaxWaterheight={8} PlLineOffsetBelowDikeTopAtRiver={11} PlLineOffsetBelowDikeToeAtPolder={12} PlLineOffsetBelowDikeTopAtPolder={13} PlLineOffsetBelowShoulderBaseInside={14} UsePlLineOffsetBelowDikeCrestMiddle {15} PlLineOffsetBelowDikeCrestMiddle {16} UsePlLineOffsetFactorBelowShoulderCrest {17} PlLineOffsetFactorBelowShoulderCrest {18} HeadPl3={19} HeadPl4={20}",
-                                 Location.Name, LocationScenarioID, RiverLevel,
+            return String.Format("Location={0}, ID={1} RiverLevel={2} " +
+                                 "RiverLevelLow={3} " +
+                                 "DikeTableHeight={4} " +
+                                 "SafetyFactorStabilityInnerSlope={5} " +
+                                 "RequiredSafetyFactorStabilityOuterSlope={6} " +
+                                 "WaterHeightDecimeringsHoogte= {7} " +
+                                 "MaxWaterheight={8} " +
+                                 "PlLineOffsetBelowDikeTopAtRiver={9} " +
+                                 "PlLineOffsetBelowDikeToeAtPolder={10} " +
+                                 "PlLineOffsetBelowDikeTopAtPolder={11} " +
+                                 "PlLineOffsetBelowShoulderBaseInside={12} " +
+                                 "UsePlLineOffsetBelowDikeCrestMiddle {13} " +
+                                 "PlLineOffsetBelowDikeCrestMiddle {14} " +
+                                 "UsePlLineOffsetFactorBelowShoulderCrest {15} " +
+                                 "PlLineOffsetFactorBelowShoulderCrest {16} " +
+                                 "HeadPl3={17} " +
+                                 "HeadPl4={18}",
+                                 Location.Name, 
+                                 LocationScenarioID, 
+                                 RiverLevel,
                                  RiverLevelLow.HasValue ? RiverLevelLow.ToString() : "?",
                                  DikeTableHeight.HasValue ? DikeTableHeight.ToString() : "?",
                                  ModelFactors.RequiredSafetyFactorStabilityInnerSlope.HasValue ? ModelFactors.RequiredSafetyFactorStabilityInnerSlope.ToString() : "?",
@@ -973,169 +669,6 @@
                                  PlLineOffsetFactorBelowShoulderCrest.HasValue ? PlLineOffsetFactorBelowShoulderCrest.ToString() : "?",
                                  HeadPl3.HasValue ? HeadPl3.ToString() : "?",
                                  HeadPl4.HasValue ? HeadPl4.ToString() : "?");
-        }
-
-        public Dictionary<string, string> GetParametersAsNameValuePairs()
-        {
-            var numberFormatInfo = new NumberFormatInfo();
-            numberFormatInfo.NumberDecimalSeparator = ".";
-            var nameValuePairs = new Dictionary<string, string>();
-            nameValuePairs.Add(ScenarioParameterNames.LocationScenarioId, LocationScenarioID);
-            nameValuePairs.Add(ScenarioParameterNames.RiverLevel, RiverLevel.ToString(numberFormatInfo));
-            if (RiverLevelLow != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.RiverLevelLow, RiverLevelLow.Value.ToString(numberFormatInfo));
-            }
-            if (DikeTableHeight != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.DikeTableHeight, DikeTableHeight.Value.ToString(numberFormatInfo));
-            }
-            if (WaterHeightDecimeringsHoogte != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.WaterHeightDecimeringsHoogte, WaterHeightDecimeringsHoogte.Value.ToString(numberFormatInfo));
-            }
-            if (MaxWaterLevel != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.MaxWaterLevel, MaxWaterLevel.Value.ToString(numberFormatInfo));
-            }
-            if (ModelFactors != null)
-            {
-                if (ModelFactors.RequiredSafetyFactorStabilityInnerSlope != null)
-                {
-                    nameValuePairs.Add(ScenarioParameterNames.RequiredSafetyFactorStabilityInnerSlope, ModelFactors.RequiredSafetyFactorStabilityInnerSlope.Value.ToString(numberFormatInfo));
-                }
-                if (ModelFactors.RequiredSafetyFactorStabilityOuterSlope != null)
-                {
-                    nameValuePairs.Add(ScenarioParameterNames.RequiredSafetyFactorStabilityOuterSlope, ModelFactors.RequiredSafetyFactorStabilityOuterSlope.Value.ToString(numberFormatInfo));
-                }
-                if (ModelFactors.RequiredSafetyFactorPiping != null)
-                {
-                    nameValuePairs.Add(ScenarioParameterNames.RequiredSafetyFactorPiping, ModelFactors.RequiredSafetyFactorPiping.Value.ToString(numberFormatInfo));
-                }
-                if (ModelFactors.UpliftCriterionPiping != null)
-                {
-                    nameValuePairs.Add(ScenarioParameterNames.UpliftCriterionPiping, ModelFactors.UpliftCriterionPiping.Value.ToString(numberFormatInfo));
-                }
-                if (ModelFactors.UpliftCriterionStability != null)
-                {
-                    nameValuePairs.Add(ScenarioParameterNames.UpliftCriterionStability, ModelFactors.UpliftCriterionStability.Value.ToString(numberFormatInfo));
-                }
-            }
-            if (PlLineOffsetBelowDikeTopAtRiver != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowDikeTopAtRiver, PlLineOffsetBelowDikeTopAtRiver.Value.ToString(numberFormatInfo));
-            }
-            if (PlLineOffsetBelowDikeTopAtPolder != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtPolder.Value.ToString(numberFormatInfo));
-            }
-            if (PlLineOffsetBelowShoulderBaseInside != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowShoulderBaseInside, PlLineOffsetBelowShoulderBaseInside.Value.ToString(numberFormatInfo));
-            }
-            if (PlLineOffsetBelowDikeToeAtPolder != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeToeAtPolder.Value.ToString(numberFormatInfo));
-            }
-            if (PlLineOffsetBelowDikeCrestMiddle != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowDikeCrestMiddle, PlLineOffsetBelowDikeCrestMiddle.Value.ToString(numberFormatInfo));
-            }
-            if (PlLineOffsetFactorBelowShoulderCrest != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetFactorBelowShoulderCrest, PlLineOffsetFactorBelowShoulderCrest.Value.ToString(numberFormatInfo));
-            }
-            if (UsePlLineOffsetBelowDikeCrestMiddle != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.UsePlLineOffsetBelowDikeCrestMiddle, UsePlLineOffsetBelowDikeCrestMiddle.Value.ToString());
-            }
-            if (UsePlLineOffsetFactorBelowShoulderCrest != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.UsePlLineOffsetFactorBelowShoulderCrest, UsePlLineOffsetFactorBelowShoulderCrest.Value.ToString());
-            }
-            if (HeadPl3 != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.HeadPl3, HeadPl3.Value.ToString(numberFormatInfo));
-            }
-            if (HeadPl4 != null)
-            {
-                nameValuePairs.Add(ScenarioParameterNames.HeadPl4, HeadPl4.Value.ToString(numberFormatInfo));
-            }
-            return nameValuePairs;
-        }
-
-        public void SetParameterFromNameValuePair(string parameterName, string parameterValue)
-        {
-            var numberFormatInfo = new NumberFormatInfo();
-            numberFormatInfo.NumberDecimalSeparator = ".";
-            if (parameterName.Equals(ScenarioParameterNames.LocationScenarioId))
-                LocationScenarioID = parameterValue;
-            if (parameterName.Equals(ScenarioParameterNames.RiverLevel))
-                RiverLevel = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.RiverLevelLow))
-                RiverLevelLow = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.DikeTableHeight))
-                DikeTableHeight = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.WaterHeightDecimeringsHoogte))
-                WaterHeightDecimeringsHoogte = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.MaxWaterLevel))
-                MaxWaterLevel = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorStabilityInnerSlope))
-                ModelFactors.RequiredSafetyFactorStabilityInnerSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorStabilityOuterSlope))
-                ModelFactors.RequiredSafetyFactorStabilityOuterSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorPiping))
-                ModelFactors.RequiredSafetyFactorPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.UpliftCriterionPiping))
-                ModelFactors.UpliftCriterionPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.UpliftCriterionStability))
-                ModelFactors.UpliftCriterionStability = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowDikeTopAtRiver))
-                PlLineOffsetBelowDikeTopAtRiver = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowDikeTopAtPolder))
-                PlLineOffsetBelowDikeTopAtPolder = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowShoulderBaseInside))
-                PlLineOffsetBelowShoulderBaseInside = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowDikeToeAtPolder))
-                PlLineOffsetBelowDikeToeAtPolder = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowDikeCrestMiddle))
-                PlLineOffsetBelowDikeCrestMiddle = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetFactorBelowShoulderCrest))
-                PlLineOffsetFactorBelowShoulderCrest = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.UsePlLineOffsetBelowDikeCrestMiddle))
-                UsePlLineOffsetBelowDikeCrestMiddle = Convert.ToBoolean(parameterValue);
-            if (parameterName.Equals(ScenarioParameterNames.UsePlLineOffsetFactorBelowShoulderCrest))
-                UsePlLineOffsetFactorBelowShoulderCrest = Convert.ToBoolean(parameterValue);
-            if (parameterName.Equals(ScenarioParameterNames.HeadPl3))
-                HeadPl3 = Convert.ToDouble(parameterValue, numberFormatInfo);
-            if (parameterName.Equals(ScenarioParameterNames.HeadPl4))
-                HeadPl4 = Convert.ToDouble(parameterValue, numberFormatInfo);
-        }
-    }
-
-    public static class ScenarioParameterNames
-    {
-        public const string LocationScenarioId = "LocationScenarioId";
-        public const string RiverLevel = "RiverLevel";
-        public const string RiverLevelLow = "RiverLevelLow";
-        public const string DikeTableHeight = "DikeTableHeight";
-        public const string WaterHeightDecimeringsHoogte = "WaterHeightDecimeringsHoogte";
-        public const string MaxWaterLevel = "MaxWaterLevel";
-
-        public const string RequiredSafetyFactorStabilityInnerSlope = "RequiredSafetyFactorStabilityInnerSlope";
-        public const string RequiredSafetyFactorStabilityOuterSlope = "RequiredSafetyFactorStabilityOuterSlope";
-        public const string RequiredSafetyFactorPiping = "RequiredSafetyFactorPiping";
-        public const string UpliftCriterionPiping = "UpliftCriterionPiping";
-        public const string UpliftCriterionStability = "UpliftCriterionStability";
-        public const string PlLineOffsetBelowDikeTopAtRiver = "PLLineOffsetBelowDikeTopAtRiver";
-        public const string PlLineOffsetBelowDikeTopAtPolder = "PLLineOffsetBelowDikeTopAtPolder";
-        public const string PlLineOffsetBelowShoulderBaseInside = "PLLineOffsetBelowShoulderBaseInside";
-        public const string PlLineOffsetBelowDikeToeAtPolder = "PLLineOffsetBelowDikeToeAtPolder";
-        public const string PlLineOffsetBelowDikeCrestMiddle = "PlLineOffsetBelowDikeCrestMiddle";
-        public const string PlLineOffsetFactorBelowShoulderCrest = "PlLineOffsetFactorBelowShoulderCrest";
-        public const string UsePlLineOffsetBelowDikeCrestMiddle = "UsePlLineOffsetBelowDikeCrestMiddle";
-        public const string UsePlLineOffsetFactorBelowShoulderCrest = "UsePlLineOffsetFactorBelowShoulderCrest";
-        public const string HeadPl3 = "HeadPL3";
-        public const string HeadPl4 = "HeadPL4";
-    }
+        }        
+    }    
 }
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/SpecificationBaseAttribute.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/GreaterThanOrEqualToSpecification.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs
===================================================================
diff -u -r1974 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 2113)
@@ -114,22 +114,13 @@
         }
 
         /// <summary>
-        /// Resets the group identifier.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        public void ResetGroupID(int id)
-        {
-            sensorGroup.ID = id;
-        }
-
-        /// <summary>
         /// Gets the sensorGroup ID. 
         /// </summary>
         /// <remarks>
         /// If the ID has value -1 then the there is no valid reference (null) 
         /// or the sensorGroup is transient. 
         /// </remarks>
-        public int GroupID
+        public int GroupId
         {
             get
             {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r2100 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2100)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2113)
@@ -48,11 +48,6 @@
     /// </summary>
     public enum TimeSerieParameters
     {
-        PipingFactorWtiSellmeijerRevised,
-        PipingFactorBligh,
-        PipingFactorSellmeijer,
-        ProbabilityOfFailurePipingSellmeijer,
-        OvertoppingErosion,
         StabilityInsideFactor,
         StabilityOutsideFactor
     }
@@ -316,11 +311,7 @@
                 string resultMessage = exception.Message;
                 calculationResult = CalculationResult.RunFailed;
                 kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, null, resultMessage, out designResults);
-            }
-            finally
-            {
-                // collect results
-            }
+            }            
     }
 
         /// <summary>
@@ -498,7 +489,6 @@
         /// <param name="firstSeriesEntries">The first series entries.</param>
         /// <param name="timeSeries">The time series.</param>
         /// <param name="hasFirstSeriesEntries">if set to <c>true</c> [has first series entries].</param>
-        /// <exception cref="SensorTimeSeriesProcessorException">Invalid data in time series entries. Number of entries differ on each sensor</exception>
         private static void ThrowIfTimeEntryCountDontMatch(HashSet<DateTime> firstSeriesEntries, TimeSerie timeSeries,
                                                            bool hasFirstSeriesEntries)
         {
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/MinimumAttribute.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r2111 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 2113)
@@ -93,20 +93,13 @@
     public class Location
     {
         // Added initial value as these properties must be tested for real values on import
-        private const double boezemLevelNotSetValue = -987654321.0;
         private static DamProjectType damProjectType = DamProjectType.Operational;
         private readonly List<DesignScenario> scenarios = new List<DesignScenario>();
-        private double boezemLevelHbp = boezemLevelNotSetValue;
-        private double boezemLevelLbp = boezemLevelNotSetValue;
-        private double boezemLevelTp = boezemLevelNotSetValue;
-
+        
         private ModelParametersForPlLines modelParametersForPlLines = new ModelParametersForPlLines();
         private DamType damType = DamType.Primary;
-        private double detrimentFactor = 0.95;
         private string dikeEmbankmentMaterial = "";
-        private SoilType dikeMaterialType = SoilType.Clay;
         private double dikeTableHeight;
-        private double dredgingDepth;
         
         private IList<GaugePlLine> gaugePlLines = new List<GaugePlLine>();
         private IList<Gauge> gauges = new List<Gauge>();
@@ -116,8 +109,7 @@
         
         // Start of parameters that are also defined in modelparameters
         private Pl1Line localXzpl1Line;
-        private GeometryPoint localXzSheetPilePoint;
-
+        
         private StabilityOptions stabilityOptions;
         private ModelFactors modelFactors = new ModelFactors();
         private string name = "";
@@ -139,11 +131,9 @@
         private double polderLevelLow;
         private bool redesignDikeHeight = true;
         private bool redesignDikeShoulder = true;
-        private double rwBankProtectionBottomLevel;
         private double scenarioRiverLevel;
         private Segment segment;
         private SensorLocation sensorLocation;
-        private double sheetPileLength;
         private string shoulderEmbankmentMaterial = "";
         private double slopeAdaptionEndCotangent = 6.0;
         private double slopeAdaptionStartCotangent = 3.0;
@@ -276,24 +266,6 @@
         }
 
         /// <summary>
-        /// Gets or sets the length of the sheet pile.
-        /// </summary>
-        /// <value>
-        /// The length of the sheet pile.
-        /// </value>
-        public virtual double SheetPileLength
-        {
-            get
-            {
-                return sheetPileLength;
-            }
-            set
-            {
-                sheetPileLength = value;                
-            }
-        }
-
-        /// <summary>
         /// Gets or sets the local XZPL1 line.
         /// </summary>
         /// <value>
@@ -319,24 +291,6 @@
         public virtual SurfaceLine2 SurfaceLine { get; set; }
 
         /// <summary>
-        /// Gets or sets the local xz sheet pile point.
-        /// </summary>
-        /// <value>
-        /// The local xz sheet pile point.
-        /// </value>
-        public virtual GeometryPoint LocalXzSheetPilePoint
-        {
-            get
-            {
-                return localXzSheetPilePoint;
-            }
-            set
-            {
-                localXzSheetPilePoint = value;                
-            }
-        }
-
-        /// <summary>
         /// Gets or sets the Segment
         /// </summary>
         public virtual Segment Segment
@@ -504,28 +458,6 @@
         }
 
         /// <summary>
-        /// Gets a value indicating whether [uses gauges].
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if [uses gauges]; otherwise, <c>false</c>.
-        /// </value>
-        public bool UsesGauges
-        {
-            get
-            {
-                return GaugePlLines != null && GaugePlLines.Count > 0 && Gauges != null;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the gauge miss value.
-        /// </summary>
-        /// <value>
-        /// The gauge miss value.
-        /// </value>
-        public double GaugeMissVal { get; set; }
-
-        /// <summary>
         /// Gets or sets a value indicating whether [redesign dike height].
         /// </summary>
         /// <value>
@@ -1425,21 +1357,6 @@
         {
             var factory = new SensorFactory();
             SensorLocation = factory.CreateSensorLocation(this);
-        }
-
-        /// <summary>
-        /// Creates an instance of model parameters for pl lines.
-        /// </summary>
-        /// <returns></returns>
-        public ModelParametersForPlLines CreateModelParametersForPlLines()
-        {
-            return new ModelParametersForPlLines
-            {
-                PenetrationLength = ModelParametersForPlLines.PenetrationLength,
-                DampingFactorPl3 = ModelParametersForPlLines.DampingFactorPl3,
-                DampingFactorPl4 = ModelParametersForPlLines.DampingFactorPl4,
-                PlLineCreationMethod = ModelParametersForPlLines.PlLineCreationMethod
-            };
-        }
+        }        
     }
 }
\ No newline at end of file
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/DikeJob.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/SpecificationBase.cs
===================================================================
diff -u -r1974 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/SpecificationBase.cs	(.../SpecificationBase.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/SpecificationBase.cs	(.../SpecificationBase.cs)	(revision 2113)
@@ -29,7 +29,7 @@
     {
         protected SpecificationBase()
         {
-            Name = this.GetType().Name;
+            Name = GetType().Name;
         }
 
         /// <summary>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r2111 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 2113)
@@ -35,11 +35,9 @@
         private IList<Segment> segments;
         private Dike dike;
         private DamProjectCalculationSpecification damProjectCalculationSpecification;
-        private DikeJob dikeJob;
         private DamProjectType damProjectType = DamProjectType.Operational;
-        private List<LocationJob> jobs = new List<LocationJob>();
         private List<DesignResult> designCalculations;
-        private TimeSerieCollection outputTimeSerieCollection = null;
+        private TimeSerieCollection outputTimeSerieCollection;
         private SensorData sensorData;
         private string calculationMap = "";
         private string projectPath = "";
@@ -77,7 +75,6 @@
         /// </summary>
         public DamProjectData()
         {
-            dikeJob = null;
             damProjectCalculationSpecification = new DamProjectCalculationSpecification();
             dike = new Dike();
             segments = new List<Segment>();
@@ -138,27 +135,6 @@
 
         }
 
-        public virtual DamJob DikeJob
-        {
-            get
-            {
-                if (dikeJob == null)
-                {
-
-                    dikeJob = new DikeJob(dike);
-                    foreach (Location location in dike.Locations)
-                    {
-                        LocationJob locationJob = new LocationJob(location);
-                        dikeJob.Jobs.Add(locationJob);
-                    }
-
-                }
-
-                return dikeJob;
-            }
-            set { dikeJob = value as DikeJob; }
-        }
-
         /// <summary>
         /// Gets or sets the type of the dam project.
         /// </summary>
@@ -170,16 +146,9 @@
             get { return damProjectType; }
             set
             {
-                bool modified = damProjectType != value;
-
                 damProjectType = value;
                 Location.DamProjectType = value;
                 DamFailureMechanismeCalculationSpecification.DamProjectType = value;
-
-                if (modified)
-                {
-                    LocationJob.DamProjectType = damProjectType;
-                }
             }
         }
 
@@ -202,31 +171,6 @@
         }
 
         /// <summary>
-        /// Gets or sets the location jobs.
-        /// </summary>
-        /// <value>
-        /// The location jobs.
-        /// </value>
-        public List<LocationJob> LocationJobs
-        {
-            get
-            {
-                if (jobs.Count == 0 && dikeJob != null)
-                {
-                    foreach (LocationJob locationJob in dikeJob.Jobs)
-                    {
-                        jobs.Add(locationJob);
-                    }
-                }
-                return jobs;
-            }
-            set
-            {
-                jobs = value;
-            }
-        }
-
-        /// <summary>
         /// Gets or sets the project path.
         /// </summary>
         /// <value>
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/ValueBoundSpecification.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/Extensions/SpecificationExtensions.cs
===================================================================
diff -u -r1974 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/Extensions/SpecificationExtensions.cs	(.../SpecificationExtensions.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/Extensions/SpecificationExtensions.cs	(.../SpecificationExtensions.cs)	(revision 2113)
@@ -19,11 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using Deltares.DamEngine.Data.Standard.Validation;
 
 namespace Deltares.DamEngine.Data.General.Specifications.Extensions
 {
@@ -32,111 +29,6 @@
         public static IEnumerable<T> GetBySpecification<T>(this IEnumerable<T> collection, ISpecification<T> specification)
         {
             return collection.Where(specification.IsSatisfiedBy);
-        }
-
-        public static bool IsSatisfiedBySpecification<T>(this T source, ISpecification<T> specification)
-        {
-            return specification.IsSatisfiedBy(source);
-        }
-
-        public static bool IsNotSatisfiedBySpecification<T>(this T source, ISpecification<T> specification)
-        {
-            return !IsSatisfiedBySpecification(source, specification);
-        }
-
-        public static IEnumerable<ValidationResult> Validate<T>(this T source, string groupName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public static IEnumerable<ValidationResult> Validate<T>(this T source)
-        {
-            var validationResults = new List<ValidationResult>();
-
-            foreach (var attribute in source.GetType().GetCustomAttributes(false))
-            {
-                var specAttr = attribute as SpecificationBaseAttribute;
-                if (specAttr != null)
-                {
-                    if (IsNotSatisfiedBySpecification(source, (ISpecification<T>)specAttr.Specification))
-                        AddValidationResult(source, validationResults, specAttr);
-                }
-            }
-
-            foreach (PropertyInfo property in source.GetType().GetProperties())
-            {
-                foreach (object attribute in property.GetCustomAttributes(true))
-                {
-                    var specAttr = attribute as SpecificationBaseAttribute;
-                    if (specAttr != null)
-                    {
-                        object candidateValue = property.GetValue(source, null);
-                        if (!specAttr.Specification.IsSatisfiedBy(candidateValue))
-                            AddValidationResult(property, validationResults, specAttr);
-                    }
-                    else
-                    {
-                        var minAttr = attribute as MinimumAttribute;
-                        if (minAttr != null)
-                        {
-                            var gte =
-                                new GreaterThanOrEqualToSpecification<T, double>(property.Name, minAttr.AttributeValue);
-                            if (!gte.IsSatisfiedBy(source))
-                            {
-                                validationResults.Add(new ValidationResult()
-                                {
-                                    Subject = property,
-                                    MessageType = ValidationResultType.Error,
-                                    Text = string.Format("The property or field {0} has the value {1} which is less then the specification {2}",
-                                               property.Name, gte.CandidateValue, minAttr.AttributeValue)
-                                });
-                            }
-                        }
-                        else
-                        {
-                            var maxAttr = attribute as MaximumAttribute;
-                            if (maxAttr != null)
-                            {
-                                var lte =
-                                    new LessThanOrEqualToSpecification<T, double>(property.Name, maxAttr.AttributeValue);
-                                if (!lte.IsSatisfiedBy(source))
-                                {
-                                    validationResults.Add(new ValidationResult()
-                                    {
-                                        Subject = property,
-                                        MessageType = ValidationResultType.Error,
-                                        Text = string.Format("The property or field {0} has the value {1} which is greater then the specification {2}",
-                                                   property.Name, lte.CandidateValue, maxAttr.AttributeValue)
-                                    });
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return validationResults;
-        }
-
-        private static void AddValidationResult(object subject, ICollection<ValidationResult> validationResults, SpecificationBaseAttribute specAttr)
-        {
-            string message = specAttr.NotSatisfiedText;
-
-            if (string.IsNullOrWhiteSpace(message))
-                message = specAttr.Specification.Description;
-
-            if (string.IsNullOrWhiteSpace(message))
-                message = specAttr.Specification.Name;
-
-            if (string.IsNullOrWhiteSpace(message))
-                message = specAttr.Specification.ToString();
-
-            validationResults.Add(new ValidationResult()
-            {
-                Subject = subject,
-                MessageType = ValidationResultType.Error,
-                Text = message
-            });
-        }
+        }        
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/NotSpecification.cs
===================================================================
diff -u -r1974 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/NotSpecification.cs	(.../NotSpecification.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/NotSpecification.cs	(.../NotSpecification.cs)	(revision 2113)
@@ -39,10 +39,10 @@
         /// </returns>
         public override bool IsSatisfiedBy(TCandidate candidate)
         {
-            bool satisfied = !(this.specification.IsSatisfiedBy(candidate));
+            bool satisfied = !(specification.IsSatisfiedBy(candidate));
             if (!satisfied)
             {
-                base.Description = this.specification.Description;
+                base.Description = specification.Description;
             }
             return satisfied;
         }
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/CompositeJob.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Specifications/ValidationException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2113 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamJob.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/UpliftSituation.cs
===================================================================
diff -u -r1974 -r2113
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/UpliftSituation.cs	(.../UpliftSituation.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/UpliftSituation.cs	(.../UpliftSituation.cs)	(revision 2113)
@@ -19,12 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Deltares.DamEngine.Data.General
 {
     /// <summary>