Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs
===================================================================
diff -u -r599 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs	(.../StabilityCalculator.cs)	(revision 599)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs	(.../StabilityCalculator.cs)	(revision 670)
@@ -89,8 +89,7 @@
         
         public static string ModelSubDirectory = "";
         private MStabProject dotNetMstabProjectResults;
-        public PhreaticAdaptionType? NWOPhreaticAdaption { get; set; }
-
+        
         /// <summary>
         /// Create PLLines with selected model
         /// </summary>
@@ -179,7 +178,6 @@
                 plLineCreator.PlLineOffsetFactorBelowShoulderCrest = location.PlLineOffsetFactorBelowShoulderCrest;
                 plLineCreator.UsePlLineOffsetBelowDikeCrestMiddle = location.UsePlLineOffsetBelowDikeCrestMiddle;
                 plLineCreator.UsePlLineOffsetFactorBelowShoulderCrest = location.UsePlLineOffsetFactorBelowShoulderCrest;
-                plLineCreator.NWOPhreaticAdaption = NWOPhreaticAdaption;
                 plLineCreator.XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin;
 
                 plLines = plLineCreator.CreateAllPLLines(location);
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs
===================================================================
diff -u -r599 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs	(.../DamProjectCalculatorCsvExportDataBuilder.cs)	(revision 599)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs	(.../DamProjectCalculatorCsvExportDataBuilder.cs)	(revision 670)
@@ -46,7 +46,6 @@
         /// <param name="scenario">The <see cref="Scenario"/> for which to create <see cref="DesignResult"/>.</param>
         /// <param name="damFailureMechanismCalculationSpecification">The <see cref="DamFailureMechanismeCalculationSpecification"/> for which to create <see cref="DesignResult"/>.</param>
         /// <param name="analysisType">The <see cref="AnalysisType"/> for which to create <see cref="DesignResult"/>.</param>
-        /// <param name="probabilisticType">The <see cref="ProbabilisticType"/> for which to create <see cref="DesignResult"/></param>
         public DamProjectCalculatorCsvExportDataBuilder(Dike dike, DesignScenario scenario, DamFailureMechanismeCalculationSpecification damFailureMechanismCalculationSpecification, AnalysisType analysisType)
         {
             Dike = dike;
@@ -61,34 +60,15 @@
         /// and the message queue is cleared.
         /// </summary>
         /// <param name="soilGeometryProbability">The <see cref="SoilGeometryProbability"/> for which to create this <see cref="DesignResult"/>.</param>
-        /// <param name="kernelType">The <see cref="StabilityKernelType"/> to set for the to be created <see cref="DesignResult"/>. Default is the 0th <see cref="StabilityKernelType"/>.</param>
         /// <returns>The newly constructed <see cref="DesignResult"/> with messages appended using <see cref="Append"/>.</returns>
-        public DesignResult Build(SoilGeometryProbability soilGeometryProbability, StabilityKernelType kernelType = (StabilityKernelType) 0)
+        public DesignResult Build(SoilGeometryProbability soilGeometryProbability)
         {
-            return Build(soilGeometryProbability, kernelType, 0);
-        }
-
-        /// <summary>
-        /// Returns a new instance of <see cref="DesignResult"/>. Messages that were added using <see cref="Append"/> are added to the <see cref="DesignResult"/>
-        /// and the message queue is cleared.
-        /// </summary>
-        /// <param name="soilGeometryProbability">The <see cref="SoilGeometryProbability"/> for which to create this <see cref="DesignResult"/>.</param>
-        /// <param name="index">An optional index to associate the <see cref="DesignResult"/> with some other object of a list.</param>
-        /// <returns>The newly constructed <see cref="DesignResult"/> with messages appended using <see cref="Append"/>.</returns>
-        public DesignResult Build(SoilGeometryProbability soilGeometryProbability, int index)
-        {
-            return Build(soilGeometryProbability, 0, index);
-        }
-
-        private DesignResult Build(SoilGeometryProbability soilGeometryProbability, StabilityKernelType kernelType, int index)
-        {
             var data = new DesignResult(
                 FailureMechanismSystemType,
                 Scenario,
                 soilGeometryProbability.SoilProfile1D,
                 soilGeometryProbability.StiFileName,
-                AnalysisType,
-                index);
+                AnalysisType);
             Message.Clear();
 
             return data;
Index: dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs
===================================================================
diff -u -r599 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 599)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Design/DesignScenario.cs	(.../DesignScenario.cs)	(revision 670)
@@ -122,8 +122,6 @@
             set { calculationResult = value; }
         }
 
-        public IList<NonWaterRetainingObjectResults> NwoResults { get; set; }
-
         public List<DesignResult> CalculationResults
         {
             get { return calculationResults; }
@@ -167,7 +165,6 @@
             safetyFactorsPiping = new Dictionary<Object, double?>();
             resultMessages = new Dictionary<Object, string>();
             redesignedSurfaceLines = new Dictionary<Object, SurfaceLine2>();
-            NwoResults = new List<NonWaterRetainingObjectResults>();
             calculationResults.Clear(); 
         }
 
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs
===================================================================
diff -u -r669 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 669)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 670)
@@ -169,37 +169,12 @@
         ForbiddenZone = 2
     }
 
-    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
-    public enum NonWaterRetainingObjectCategory
-    {
-        Tree,
-        Main
-    };
-
-    // TODO: NWO obsolete
-    public enum NonWaterRetainingObjectType
-    {
-        Oak,
-        Alder,
-        Poplar,
-        GasMain,
-        WaterMain
-    };
-
     public enum StabilityDesignMethod //Design
     {
         OptimizedSlopeAndShoulderAdaption,
         SlopeAdaptionBeforeShoulderAdaption
     }
 
-    // TODO: NWO obsolete
-    public enum PhreaticAdaptionType //NWO
-    {
-        None,
-        MakeEmpty,
-        Fill            // Note: Fill not yet implemented!
-    } ;
-
     public enum PLLineType
     {
         PL1,
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityResultTypes.cs
===================================================================
diff -u -r452 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityResultTypes.cs	(.../StabilityResultTypes.cs)	(revision 452)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/StabilityResultTypes.cs	(.../StabilityResultTypes.cs)	(revision 670)
@@ -57,33 +57,5 @@
             exitPointXCoordinate = 0.0;
             beta = 0.0;
         }
-    }
-
-    public struct NonWaterRetainingObjectResults
-    {
-        public string NwoId;
-        public double LocationXrdStart;
-        public double LocationYrdStart;
-        public double LocationZrdStart;
-        public double LocationXrdEnd;
-        public double LocationYrdEnd;
-        public double LocationZrdEnd;
-        public MStabResults MStabResults;
-        public SurfaceLine2 AdaptedSurfaceLine;
-        public SoilGeometryProbability SoilProfileProbability;
-        public void Init()
-        {
-            NwoId = "";
-            MStabResults = new MStabResults();
-            MStabResults.Init();
-            LocationXrdStart = 0.0;
-            LocationYrdStart = 0.0;
-            LocationZrdStart = 0.0;
-            LocationXrdEnd = 0.0;
-            LocationYrdEnd = 0.0;
-            LocationZrdEnd = 0.0;
-            AdaptedSurfaceLine = null;
-        }
-
-    }    
+    }        
 }
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs
===================================================================
diff -u -r596 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs	(.../DamMacroStabilityKernelWrapper.cs)	(revision 596)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/DamMacroStabilityKernelWrapper.cs	(.../DamMacroStabilityKernelWrapper.cs)	(revision 670)
@@ -206,7 +206,7 @@
             var s = new DesignScenario();
             s.Location = new Location();
             var p = new SoilProfile1D();
-            designResult = new DesignResult(d, s, p, soilProfile2DName, AnalysisType.NoAdaption, 0);
+            designResult = new DesignResult(d, s, p, soilProfile2DName, AnalysisType.NoAdaption);
 
             var stabilityDesignResults = new StabilityDesignResults();
             stabilityDesignResults.Zone1SafetyFactor = damPipingOutput.Zone1.SafetyFactor;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs
===================================================================
diff -u -r659 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 659)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapper.cs	(.../DamPipingBlighKernelWrapper.cs)	(revision 670)
@@ -196,7 +196,7 @@
 
             designResult = new DesignResult(damFailureMechanismeCalculationSpecification, 
                 designScenario, soilProfile1D, soilProfile2DName, 
-                DamProjectCalculationSpecification.SelectedAnalysisType, 0);
+                DamProjectCalculationSpecification.SelectedAnalysisType);
             designResult.CalculationResult = damPipingBlighOutput.CalculationResult;
             var pipingDesignResults = new PipingDesignResults(PipingModelType.Bligh);
             pipingDesignResults.BlighFactor = damPipingBlighOutput.FoSp;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs
===================================================================
diff -u -r653 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs	(.../DamPipingSellmeijer4ForcesKernelWrapper.cs)	(revision 653)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapper.cs	(.../DamPipingSellmeijer4ForcesKernelWrapper.cs)	(revision 670)
@@ -197,7 +197,7 @@
             var d = new DamFailureMechanismeCalculationSpecification();
             var designScenario = damKernelInput.DesignScenario;
             var soilProfile1D = damKernelInput.SubSoilScenario.SoilProfile1D;
-            designResult = new DesignResult(d, designScenario, soilProfile1D, soilProfile2DName, AnalysisType.NoAdaption, 0);
+            designResult = new DesignResult(d, designScenario, soilProfile1D, soilProfile2DName, AnalysisType.NoAdaption);
 
             var pipingDesignResults = new PipingDesignResults(PipingModelType.Sellmeijer4Forces);
             pipingDesignResults.Sellmeijer4ForcesFactor = damPipingOutput.FoSp;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PLLinesCreator.cs
===================================================================
diff -u -r669 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PLLinesCreator.cs	(.../PLLinesCreator.cs)	(revision 669)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PLLinesCreator.cs	(.../PLLinesCreator.cs)	(revision 670)
@@ -108,8 +108,7 @@
         public double? PlLineOffsetFactorBelowShoulderCrest { get; set; }
         public bool? UsePlLineOffsetBelowDikeCrestMiddle { get; set; }
         public bool? UsePlLineOffsetFactorBelowShoulderCrest { get; set; }
-        public PhreaticAdaptionType? NWOPhreaticAdaption { get; set; }
-
+        
         private double WaterLevelToUse()
         {
             if (isUseLowWaterLevel)
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs
===================================================================
diff -u -r669 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 669)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 670)
@@ -444,7 +444,7 @@
                         @""""
                     );
 
-                    scenario.CalculationResults.Add(damProjectCalculatorLogBuilder.Build(soilProfileProbability, damFailureMechanismeCalculationSpecification.StabilityKernelType));
+                    scenario.CalculationResults.Add(damProjectCalculatorLogBuilder.Build(soilProfileProbability));
                     scenario.CalculationResult = CalculationResult.Succeeded;                    
                 }
             }
@@ -552,8 +552,7 @@
                             scenario,
                             soilProfileProbability.SoilProfile1D,
                             soilProfileProbability.StiFileName,
-                            DamProjectCalculationSpecification.SelectedAnalysisType,
-                            0);
+                            DamProjectCalculationSpecification.SelectedAnalysisType);
                         scenario.CalculationResults.Add(resultRecord);
                         scenario.Errors.Add(errorMessage);
                         scenario.CalculationResult = CalculationResult.RunFailed;
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs
===================================================================
diff -u -r599 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs	(.../DesignResult.cs)	(revision 599)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/DesignResult.cs	(.../DesignResult.cs)	(revision 670)
@@ -152,9 +152,8 @@
         /// <param name="soilProfile">The soil profile.</param>
         /// <param name="soilGeometry2DName">Name of the soil geometry2 d.</param>
         /// <param name="analysisType">Type of the analysis.</param>
-        /// <param name="nwoResultIndex">Index of the nwo result.</param>
         public DesignResult(DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification, 
-            DesignScenario scenario, SoilProfile1D soilProfile, string soilGeometry2DName, AnalysisType analysisType, int nwoResultIndex)
+            DesignScenario scenario, SoilProfile1D soilProfile, string soilGeometry2DName, AnalysisType analysisType)
         {
             locationName = scenario.Location.Name;
             scenarioName = scenario.LocationScenarioID; // terughalen vanuit csvexport indien echt nodig
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/ThrowHelper.cs
===================================================================
diff -u -r452 -r670
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/ThrowHelper.cs	(.../ThrowHelper.cs)	(revision 452)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/ThrowHelper.cs	(.../ThrowHelper.cs)	(revision 670)
@@ -81,9 +81,7 @@
         SurfaceLineNotAssigned,
         SoilProfileNotAssigned,
         SoilListIsNull,
-        PL1NotCreated,
-        NonWaterRetainingObjectCategoryArgumentNullOrEmpty,
-        NonWaterRetainingObjectTypeArgumentNullOrEmpty
+        PL1NotCreated        
     }
 
     /// <summary>