Index: dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs
===================================================================
diff -u -r593 -r648
--- dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 593)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 648)
@@ -62,7 +62,6 @@
         private Scenario scenario;
         private SoilProfile1D soilProfile;
         private string soilGeometry2DName;
-        private double? safetyFactorFlowSlide;
         private double? failureProbabilityPiping;
         private double? localPipingExitPointX;
         private SurfaceLine2 redesignedSurfaceLinePiping;
@@ -93,14 +92,6 @@
         private double? pl4MinUplift;
         private double? pl4HeadAdjusted;
         private double? pl4LocalLocationXMinUplift;
-        private string nwoId;
-        private int nwoResultIndex;
-        private double? locationXrdStart;
-        private double? locationYrdStart;
-        private double? locationZrdStart;
-        private double? locationXrdEnd;
-        private double? locationYrdEnd;
-        private double? locationZrdEnd;
         private CalculationResult calculationResult = CalculationResult.NoRun;
         private string resultMessage = "";
         private int numberOfIterations;
@@ -164,16 +155,11 @@
                 if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
                     damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)
                 {
-                    if (AnalysisType == AnalysisType.AdaptNWO)
-                        numberOfIterations = scenario.NwoResults[nwoResultIndex].MStabResults.IterationNumber;
-                    else
+                    var mstabResults = scenario.GetMStabResults(soilProfile, soilGeometry2DName);
+                    if (mstabResults != null)
                     {
-                        var mstabResults = scenario.GetMStabResults(soilProfile, soilGeometry2DName);
-                        if (mstabResults != null)
-                        {
-                            numberOfIterations = mstabResults.Value.IterationNumber;
-                        }
-                    }
+                        numberOfIterations = mstabResults.Value.IterationNumber;
+                    }                    
                 }
                 return numberOfIterations;
             }
@@ -1420,57 +1406,6 @@
             set { wti2017HCritical = value; }
         }
 
-        [CsvExportColumn("NonWaterRetainingObjectId", 71)]
-        [Browsable(false)]        
-        public string NwoId { get { return this.nwoId; } }
-
-        [CsvExportColumn("NWOResultIndex", 72)]
-        [Browsable(false)]
-        public int NwoResultIndex
-        {
-            get { return this.nwoResultIndex; }
-        }
-
-        [CsvExportColumn("NWOPoint1Xrd", 73)]
-        [Browsable(false)]
-        public double? NWOLocationXrdStart
-        {
-            get { return this.locationXrdStart; }
-        }
-
-        [CsvExportColumn("NWOPoint1Yrd", 74)]
-        [Browsable(false)]
-        public double? NWOLocationYrdStart
-        {
-            get { return this.locationYrdStart; }
-        }
-
-        [CsvExportColumn("NWOPoint1Zrd", 75)]
-        [Browsable(false)]
-        public double? NWOLocationZrdStart
-        {
-            get { return this.locationZrdStart; }
-        }
-
-        [CsvExportColumn("NWOPoint4Yrd", 76)]
-        [Browsable(false)]
-        public double? NWOLocationXrdEnd
-        {
-            get { return this.locationXrdEnd; }
-        }
-
-        [CsvExportColumn("NWOPoint4Xrd", 77)]
-        [Browsable(false)]
-        public double? NWOLocationYrdEnd
-        {
-            get { return this.locationYrdEnd; }
-        }
-
-        [CsvExportColumn("NWOPoint4Zrd", 78)]
-        [Browsable(false)]
-        public double? NWOLocationZrdEnd { get { return this.locationZrdEnd; } }
-        //Note: using SurfaceLine instead of LocalXzSurfaceLine must give the proper RD coors. If this is not the case, error is somewhere else. Do not convert here!
-
         [CsvExportColumn("DikeToeAtRiverXrd", 79)]
         [Browsable(false)]
         public double? DikeToeAtRiverXrd