Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r6157 -r6171
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 6157)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 6171)
@@ -77,12 +77,6 @@
         TransferSurfaceLines(input.SurfaceLines, dike.SurfaceLines2);
         dike.SoilList = new SoilList();
         TransferSoils(input.Soils, dike.SoilList.Soils);
-        List<LogMessage> messages = TransferAquiferSoils(input.AquiferSoils, dike.SoilList);
-        if (messages.Count > 0)
-        {
-            damProjectData.CalculationMessages = messages;
-        }
-
         TransferSoilProfiles1D(input.SoilProfiles1D, dike.SoilProfiles, dike.SoilList);
         TransferSoilProfiles2D(input.SoilProfiles2D, dike.SoilProfiles2D, dike.SoilList);
         TransferTrafficLoadDegreeOfConsolidation(input.TrafficLoadDegreeOfConsolidations, dike);
@@ -253,34 +247,6 @@
         }
     }
 
-    private static List<LogMessage> TransferAquiferSoils(InputAquiferSoil[] inputAquiferSoils, SoilList soilList)
-    {
-        var validationMessages = new List<LogMessage>();
-        if (inputAquiferSoils != null)
-        {
-            soilList.AquiferDictionary.Clear();
-            foreach (InputAquiferSoil aquiferSoil in inputAquiferSoils)
-            {
-                Data.Geotechnics.Soil soil = soilList.GetSoilByName(aquiferSoil.Soilname);
-                if (!soilList.AquiferDictionary.ContainsKey(soil.Name))
-                {
-                    soilList.AquiferDictionary.Add(soil.Name, aquiferSoil.IsAquifer);
-                }
-                else
-                {
-                    // If a soil is (wrongly) in the list more than once, then prefer aquifer true. 
-                    if (aquiferSoil.IsAquifer)
-                    {
-                        validationMessages.Add(new LogMessage(LogMessageType.Warning, aquiferSoil, string.Format(Resources.DoubleAquiferSoil, aquiferSoil.Soilname)));
-                        soilList.AquiferDictionary[soil.Name] = true;
-                    }
-                }
-            }
-        }
-
-        return validationMessages;
-    }
-
     private static void TransferAnalysisSpecification(Input input, DamProjectData damProjectData)
     {
         damProjectData.DamProjectType = ConversionHelper.ConvertToDamProjectType(input.DamProjectType);
@@ -717,8 +683,6 @@
                 string tmpPath = projectPath ?? Directory.GetCurrentDirectory();
                 location.StabilityOptions = new StabilityOptions
                 {
-                    SoilGeometries2DPath = Path.Combine(tmpPath, inputLocation.StabilityOptions.MapForSoilgeometries2D),
-                    SoilDatabaseName = inputLocation.StabilityOptions.SoilDatabaseName,
                     StabilityZoneType = ConversionHelper.ConvertToZoneType(inputLocation.StabilityOptions.ZoneType)
                 };
                 if (inputLocation.StabilityOptions.ForbiddenZoneFactorSpecified)