Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r6160 -r6173
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6160)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6173)
@@ -536,8 +536,6 @@
             inputLocation.Name = location.Name;
             inputLocation.DistanceToEntryPoint = location.DistanceToEntryPoint;
             inputLocation.DistanceToEntryPointSpecified = true;
-            inputLocation.XSoilGeometry2DOriginSpecified = true;
-            inputLocation.XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin;
 
             inputLocation.SurfaceLineName = location.LocalXZSurfaceLine2.Name;
             inputLocation.SegmentName = location.Segment.Name;
@@ -590,12 +588,9 @@
             inputLocation.DikeEmbankmentMaterial = location.DikeEmbankmentMaterial;
             inputLocation.StabilityOptions = new LocationStabilityOptions
             {
-                MapForSoilgeometries2D = location.MapForSoilGeometries2D,
-                SoilDatabaseName = location.SoildatabaseName,
                 ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityZoneType),
                 ForbiddenZoneFactorSpecified = true,
                 ForbiddenZoneFactor = location.ForbiddenZoneFactor,
-                ZoneAreaRestSlopeCrestWidthSpecified = false,
                 TrafficLoadSpecified = true,
                 TrafficLoad = location.TrafficLoad,
                 TrafficLoadDegreeOfConsolidationSpecified = location.TL_DegreeOfConsolidation.HasValue,
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r6160 -r6173
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6160)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6173)
@@ -740,7 +740,7 @@
                         "SelectedLocationJobs",
                         "PickSensors",
                         "MapForSoilGeometries2D",
-                        "UserShearStrengthModel"
+                        "XSoilGeometry2DOrigin"
                     }
                 }
             };
@@ -1133,7 +1133,6 @@
                 }
 
                 location.DikeEmbankmentMaterial = "DikeMat";
-                location.MapForSoilGeometries2D = "TestMap";
                 location.StabilityZoneType = MStabZonesType.NoZones;
                 location.ForbiddenZoneFactor = 10.0 * i + 0.42;
                 location.TrafficLoad = 10.0 * i + 0.44;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r5518 -r6173
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 5518)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 6173)
@@ -526,8 +526,6 @@
 
     [Browsable(false)] public string SurfaceLineId { get; set; } = "";
 
-    [Browsable(false)] public string SoildatabaseName { get; set; } = "";
-
     [Browsable(false)] public SoilList SoilList { get; set; }
 
     [Browsable(false)] public string MapForSoilGeometries2D { get; set; } = "";
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/PersistableDataModelFactory.cs
===================================================================
diff -u -r6159 -r6173
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/PersistableDataModelFactory.cs	(.../PersistableDataModelFactory.cs)	(revision 6159)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/PersistableDataModelFactory.cs	(.../PersistableDataModelFactory.cs)	(revision 6173)
@@ -499,7 +499,7 @@
                                 new(30, 4),
                                 new(30, -5)
                             }
-                        },
+                        }
                     }
                 }
             },
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs
===================================================================
diff -u -r6159 -r6173
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs	(.../SoilProfile2DDataModelTest.cs)	(revision 6159)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs	(.../SoilProfile2DDataModelTest.cs)	(revision 6173)
@@ -165,7 +165,6 @@
     [Test]
     public void WhenDataModelWithInnerLoopsIsCreated_ThenSoilProfile2DIsAsExpected()
     {
-        const double shift = 0;
         PersistableDataModel dataModel = PersistableDataModelFactory.CreateSimpleDataModelWithInnerLoops();
         SoilProfile2D soilProfile2D = new SoilProfile2DDataModel().Create(dataModel, 0);
 
@@ -214,7 +213,6 @@
     [Test]
     public void WhenCreateDataModelWithLayerThatIsNotAnInnerLoop_ThenSoilProfile2DIsAsExpected()
     {
-        const double shift = 0;
         PersistableDataModel dataModel = PersistableDataModelFactory.CreateSimpleDataModelWithLayerThatIsNotAnInnerLoop();
         SoilProfile2D soilProfile2D = new SoilProfile2DDataModel().Create(dataModel, 0);
 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r6160 -r6173
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 6160)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 6173)
@@ -449,7 +449,6 @@
                 location.DistanceToEntryPoint = inputLocation.DistanceToEntryPoint;
             }
 
-            location.XSoilGeometry2DOrigin = inputLocation.XSoilGeometry2DOrigin;
             location.PLLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod);
             location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure);
             location.DampingFactorPL3 = waternetOptions.DampingFactorPl3;
@@ -497,8 +496,6 @@
             location.DikeEmbankmentMaterial = inputLocation.DikeEmbankmentMaterial;
             if (inputLocation.StabilityOptions != null)
             {
-                location.MapForSoilGeometries2D = inputLocation.StabilityOptions.MapForSoilgeometries2D;
-                location.SoildatabaseName = inputLocation.StabilityOptions.SoilDatabaseName;
                 location.StabilityZoneType = ConversionHelper.ConvertToZoneType(inputLocation.StabilityOptions.ZoneType);
                 if (inputLocation.StabilityOptions.ForbiddenZoneFactorSpecified)
                 {