Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r6157 -r6171
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 6157)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 6171)
@@ -70,7 +70,6 @@
         TransferSurfaceLines(dike.SurfaceLines2, input.SurfaceLines);
         input.Soils = new Io.XmlInput.Soil[dike.SoilList.Soils.Count];
         TransferSoils(dike.SoilList.Soils, input.Soils);
-        TransferAquiferSoils(dike.SoilList.AquiferDictionary, input);        
         TransferTrafficLoadDegreeOfConsolidation(dike.TrafficLoadDegreeOfConsolidations, input);
         if (dike.SoilProfiles != null)
         {
@@ -236,31 +235,6 @@
             timeSerieIndex++;
         }
     }
-
-    private static void TransferAquiferSoils(Dictionary<string, bool> aquiferDictionary, Input input)
-    {
-        InputAquiferSoil[] aquiferSoils;
-        if (aquiferDictionary != null && aquiferDictionary.Count > 0)
-        {
-            aquiferSoils = new InputAquiferSoil[aquiferDictionary.Count];
-            var soilIndex = 0;
-            foreach (KeyValuePair<string, bool> keyValuePair in aquiferDictionary)
-            {
-                aquiferSoils[soilIndex] = new InputAquiferSoil
-                {
-                    Soilname = keyValuePair.Key,
-                    IsAquifer = keyValuePair.Value
-                };
-                soilIndex++;
-            }
-        }
-        else
-        {
-            aquiferSoils = null;
-        }
-
-        input.AquiferSoils = aquiferSoils;
-    }
     
     private static void TransferTrafficLoadDegreeOfConsolidation(IList<TrafficLoadDegreeOfConsolidation> degreeOfConsolidationDictionary, Input input)
     {
@@ -573,8 +547,6 @@
             inputLocation.Name = location.Name;
             inputLocation.DistanceToEntryPoint = location.DistanceToEntryPoint;
             inputLocation.DistanceToEntryPointSpecified = true;
-            inputLocation.XSoilGeometry2DOrigin = 0.0;
-            inputLocation.XSoilGeometry2DOriginSpecified = true;
             inputLocation.SurfaceLineName = location.SurfaceLine.Name;
             inputLocation.SegmentName = location.Segment.Name;
             var waternetOptions = new LocationWaternetOptions();
@@ -660,22 +632,8 @@
             inputLocation.DikeEmbankmentMaterial = location.DikeEmbankmentMaterial;
             if (location.StabilityOptions != null)
             {
-                string tmpPath = projectPath ?? Directory.GetCurrentDirectory();
-                string tmpMap = location.StabilityOptions.SoilGeometries2DPath;
-                if (tmpMap.StartsWith(tmpPath))
-                {
-                    tmpMap = tmpMap.Remove(0, tmpPath.Length);
-                }
-
-                if (tmpMap.StartsWith(Path.DirectorySeparatorChar.ToString()))
-                {
-                    tmpMap = tmpMap.Remove(0, 1);
-                }
-
                 inputLocation.StabilityOptions = new LocationStabilityOptions
                 {
-                    MapForSoilgeometries2D = tmpMap,
-                    SoilDatabaseName = location.StabilityOptions.SoilDatabaseName,
                     ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityOptions.StabilityZoneType),
                     ForbiddenZoneFactorSpecified = location.StabilityOptions.ForbiddenZoneFactor.HasValue
                 };