Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r2529 -r2541
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(.../Translations.xml)	(revision 2529)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(.../Translations.xml)	(revision 2541)
@@ -301,10 +301,6 @@
   <Translation ID="RiverLevelLow" en-US="River level low" nl-NL="Lage buitenwaterstand" />
   <Translation ID="RiverLevelLowDescription" en-US="Water level in river (summer)" nl-NL="Lage buitenwaterstand, bijvoorbeeld LWS" />
   <Translation ID="MinimalCircleDepth" en-US="Minimum circle depth" nl-NL="Minimale cirkel diepte" />
-  <Translation ID="LevelReductionInside" en-US="Level reduction inside" nl-NL="Binnenwaartse reductie maaiveld" />
-  <Translation ID="LevelReductionOutside" en-US="Level reduction outside" nl-NL="Buitenwaartse reductie maaiveld" />
-  <Translation ID="LayerHeightDistribution" en-US="Layer height distribution" nl-NL="laagdikte verdeling" />
-  <Translation ID="LayerHeightDeviation" en-US="Layer height deviation" nl-NL="Laagdikte deviatie" />
   <Translation ID="RequiredSafetyFactorStabilityInnerSlope" en-US="Safety factor inner slope" nl-NL="Veiligheidsfactor binnenwaartse stabiliteit" />
   <Translation ID="RequiredSafetyFactorStabilityInnerSlopeDescription" en-US="Required safety factor for inner slope stability" nl-NL="Vereiste veiligheidsfactor binnenwaartse stabiliteit" />
   <Translation ID="RequiredSafetyFactorStabilityOuterSlope" en-US="Safety factor outer slope" nl-NL="Veiligheidsfactor buitenwaartse stabiliteit" />
@@ -325,7 +321,6 @@
   <Translation ID="SlopeDampingPiezometricHeightPolderSideDescription" en-US="The tangent of the slope damping for piezometric height polderSide (for PL3 and PL4)" nl-NL="De tangent van de helling voor de demping van de piezometrische hoogte aan polderzijde (voor PL3 en PL4)" />
   <Translation ID="ScenarioDefinitionName" en-US="Scenario" nl-NL="Scenario" />
   <Translation ID="AnalysisType" en-US="Analysis" nl-NL="Analyse" />
-  <Translation ID="ProbabilisticType" en-US="Probabilistic" nl-NL="Probabibilistisch" />
   <Translation ID="IsUplift" en-US="Uplift" nl-NL="Opdrijven" />
   <Translation ID="StabilityProfileName" en-US="Profile (Stability)" nl-NL="Profiel (Stabiliteit)" />
   <Translation ID="StabilityProfileProbability" en-US="Probability (Stability)" nl-NL="Kans van voorkomen ondergrond (Stabiliteit)" />
@@ -375,8 +370,6 @@
   <Translation ID="Deterministic" en-US="Deterministic" nl-NL="Deterministisch" />
   <Translation ID="CurrentScenario" en-US="Current Scenario" nl-NL="Beschouwd scenario" />
   <Translation ID="ScenarioDefinition" en-US="Scenario Definition" nl-NL="Scenario definitie" />
-  <Translation ID="WaterHeightDecimeringsHoogte" en-US="Decimation Height" nl-NL="Decimeringshoogte" />
-  <Translation ID="MaxWaterLevel" en-US="Maximum Water Level" nl-NL="Maximum waterstand" />
   <Translation ID="noLocationIdForScenarioRecordError" en-US="This scenario record has no location id." nl-NL="Dit scenario record heeft geen location id." />
   <Translation ID="duplicateScenarioRecordError" en-US="In location '{0}' the scenario '{1}' in this record already exist." nl-NL="In locatio '{0}' bestaat het scenario '{1}' al." />
   <Translation ID="locationNotFoundForScenarioRecordError" en-US="The location of this scenario record can not be found." nl-NL="De locatie die bij dit scenario record hoort kan niet gevonden worden." />
@@ -395,7 +388,6 @@
   <Translation ID="DesignAndAdaptionNotAllowedForStabilityOutside" en-US="For failuremechanism stability outside the option of design with geometry adaption is not allowed" nl-NL="Voor faalmechanisme buitenwaartse stabiliteit is ontwerp met aanpassing geometrie niet toegestaan" />
   <Translation ID="Assessment calculations" en-US="Assessment calculations" nl-NL="Toetsings berekeningen" />
   <Translation ID="HasSensorData" en-US="Has sensor data" nl-NL="Heeft sensor data" />
-  <Translation ID="IsUseOriginalPLLineAssignments" en-US="Use PL-per layer from D-GeoStability file" nl-NL="Gebruik PL-per layer uit D-GeoStability bestand" />
   <Translation ID="SurfaceLine2" en-US="Surface Line" nl-NL="Hoogte dwarsprofiel" />
   <Translation ID="XRdDikeLine" en-US="XRd Dike Line" nl-NL="XRd dijk lijn" />
   <Translation ID="ProfileName" en-US="Profile Name" nl-NL="Profielnaam" />
@@ -433,7 +425,6 @@
   <Translation ID="UpliftCriterionStabilityDescription" en-US="The uplift criterion for stability" nl-NL="Het criterium voor opdrijven bij stabiliteit" />
   <Translation ID="ScenarioName" en-US="Scenario Name" nl-NL="Scenarionaam" />
   <Translation ID="NoAdaption" en-US="No Adaption" nl-NL="Geen aanpassing" />
-  <Translation ID="SelectedProbabilisticType" en-US="Selected Probabilistic Type" nl-NL="Geselecteerd probabiliteits type" />
   <Translation ID="StabilityInside" en-US="Stability Inside" nl-NL="Binnenwaartse stabiliteit" />
   <Translation ID="StabilityOutside" en-US="Stability Outside" nl-NL="Buitenwaartse stabiliteit" />
   <Translation ID="FlowSlide" en-US="Flow Slide" nl-NL="Zettingsvloeiing" />
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs
===================================================================
diff -u -r2472 -r2541
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs	(.../FailureMechanismeParamatersMStab.cs)	(revision 2472)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs	(.../FailureMechanismeParamatersMStab.cs)	(revision 2541)
@@ -43,8 +43,6 @@
         public string SoilGeometry2DName { get; set; }
         public double RiverLevel { get; set; }
         public double DikeTableHeight { get; set; }
-        public double MaxWaterLevel { get; set; }
-        public double RiverLevelDecimateHeight { get; set; }
         public double TrafficLoad { get; set; }
         /// <summary>
         /// Indicates whether in stability calculation a check on uplift will be performed before performin UpliftVan calculation.
@@ -86,8 +84,6 @@
 
             this.RiverLevel = failureMechanismeParametersMStab.RiverLevel;
             this.DikeTableHeight = failureMechanismeParametersMStab.DikeTableHeight;
-            this.MaxWaterLevel = failureMechanismeParametersMStab.MaxWaterLevel;
-            this.RiverLevelDecimateHeight = failureMechanismeParametersMStab.RiverLevelDecimateHeight;
             this.TrafficLoad = failureMechanismeParametersMStab.TrafficLoad; ;
             this.Design = failureMechanismeParametersMStab.Design;
 
Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
===================================================================
diff -u -r2529 -r2541
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 2529)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs	(.../CsvImporterTestsNew.cs)	(revision 2541)
@@ -105,7 +105,7 @@
         }
 
 
-        private void CreateSoilProfilesFileWithObsoleteColumn()
+        private void CreateSoilProfilesFileWithObsoleteColumns()
         {
             string importFile = importFolder + "\\soilprofiles.csv";
             if (File.Exists(importFile))
@@ -319,7 +319,7 @@
             }
         }
 
-        private void CreateLocationsFile()
+        private void CreateLocationsFileWithObsoleteColumn()
         {
             string importFile = importFolder + "\\locations.csv";
             if (File.Exists(importFile))
@@ -446,7 +446,7 @@
             string importFile = importFolder + "\\soilprofiles.csv";
             if (File.Exists(importFile))
                 File.Delete(importFile);
-            CreateSoilProfilesFileWithObsoleteColumn();
+            CreateSoilProfilesFileWithObsoleteColumns();
             CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(importFile);
             IList<CsvImporterSoilProfiles.SoilProfileRecord> soilProfileRecords = csvImporterSoilProfiles.ImportedItems;
 
@@ -674,7 +674,7 @@
             string importFile = importFolder + "\\locations.csv";
             if (File.Exists(importFile))
                 File.Delete(importFile);
-            CreateLocationsFile();
+            CreateLocationsFileWithObsoleteColumn();
             CsvImporterLocations csvImporterLocations = new CsvImporterLocations(importFolder + "\\locations.csv");
             IList<CsvImporterLocations.LocationRecord> locationRecords = csvImporterLocations.ImportedItems;
             Assert.AreEqual(2, locationRecords.Count);
Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs
===================================================================
diff -u -r2529 -r2541
--- DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs	(.../CsvImporterTest.cs)	(revision 2529)
+++ DamClients/DamUI/trunk/src/Dam/Tests/CsvImporterTest.cs	(.../CsvImporterTest.cs)	(revision 2541)
@@ -73,19 +73,19 @@
         {
             using (var writer = File.CreateText(importFolder + "\\soilprofiles.csv"))
             {
-                writer.WriteLine("soilprofile_id;top_level;soil_name;soiltype");
-                writer.WriteLine("1DP1;10;HW-OBO;zand");
-                writer.WriteLine("1DP1;-0.6;HW-DUN;veen");
-                writer.WriteLine("1DP1;-1.8;HW-DUOzand;veen");
-                writer.WriteLine("1DP1;-2.8;HW-HVN;zand");
-                writer.WriteLine("1DP1;-4;HW-HVN;zand");
-                writer.WriteLine("1DP1;-5;Alg-zand (0-30);zand");
-                writer.WriteLine("1DP2;10;HW-OBO;zand");
-                writer.WriteLine("1DP2;-0.7;HW-DUN;veen");
-                writer.WriteLine("1DP2;-1.5;HW-DUOzand;veen");
-                writer.WriteLine("1DP2;-2.4;HW-HVN;zand");
-                writer.WriteLine("1DP2;-4.3;HW-HVN;zand");
-                writer.WriteLine("1DP2;-5.3;Alg-zand (0-30);zand");
+                writer.WriteLine("soilprofile_id;top_level;soil_name;");
+                writer.WriteLine("1DP1;10;HW-OBO;");
+                writer.WriteLine("1DP1;-0.6;HW-DUN;");
+                writer.WriteLine("1DP1;-1.8;HW-DUOzand;");
+                writer.WriteLine("1DP1;-2.8;HW-HVN;");
+                writer.WriteLine("1DP1;-4;HW-HVN;");
+                writer.WriteLine("1DP1;-5;Alg-zand (0-30);");
+                writer.WriteLine("1DP2;10;HW-OBO;");
+                writer.WriteLine("1DP2;-0.7;HW-DUN;");
+                writer.WriteLine("1DP2;-1.5;HW-DUOzand;");
+                writer.WriteLine("1DP2;-2.4;HW-HVN;");
+                writer.WriteLine("1DP2;-4.3;HW-HVN;");
+                writer.WriteLine("1DP2;-5.3;Alg-zand (0-30);");
             }
         }
 
@@ -138,8 +138,8 @@
         {
             using (var writer = File.CreateText(importFolder + "\\locations.csv"))
             {
-                writer.WriteLine("location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;head_pl2;head_pl3;grass_quality;direction;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments");
-                writer.WriteLine("LOC1;D1;1;414.950;91.850;14.0;PL1A;0.1;4.0;3.0;4.3;1.0;ophoogmateriaaldijk;ophoogmateriaalberm;0.31;0.41;432.1;0.0;654.3;22.0;true");
+                writer.WriteLine("location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;head_pl2;head_pl3;grass_quality;direction;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;");
+                writer.WriteLine("LOC1;D1;1;414.950;91.850;14.0;PL1A;0.1;4.0;3.0;4.3;1.0;ophoogmateriaaldijk;ophoogmateriaalberm;0.31;0.41;432.1;0.0;654.3;22.0;");
             }
         }