Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamSpatialEditorDecoratorTest.cs
===================================================================
diff -u -r4070 -r4235
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamSpatialEditorDecoratorTest.cs	(.../DamSpatialEditorDecoratorTest.cs)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamSpatialEditorDecoratorTest.cs	(.../DamSpatialEditorDecoratorTest.cs)	(revision 4235)
@@ -109,8 +109,7 @@
                 LocalXZSurfaceLine2 = surfaceLine,
                 SurfaceLine2 = surfaceLine,
                 DikeEmbankmentMaterial = dikeEmbankmentMaterial,
-                SoilList = soilList,
-                SoildatabaseName = "DatabaseName"
+                SoilList = soilList
             };
             var locationJob = new LocationJob
             {
Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs
===================================================================
diff -u -r4070 -r4235
--- DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs	(.../Program.cs)	(revision 4235)
@@ -130,10 +130,8 @@
                     damProjectData = program.LoadDike(commandLineArguments.InputDataDirectory);
 
                     Dike dike = damProjectData.WaterBoard.Dikes.First();
-                    dike.SoilDatabaseName = Path.Combine(commandLineArguments.InputDataDirectory, "soilmaterials.mdb");
 
                     // Write output files
-                    CopySoilData(projectName, commandLineArguments, dike);
                     CopyGeometryData(projectName, commandLineArguments, dike);
 
                     string sensorDataFileName = commandLineArguments.SensorDataFileName;
@@ -196,39 +194,6 @@
         }
 
         /// <summary>
-        /// Copies the soil data.
-        /// </summary>
-        /// <param name="projectName">Name of the project.</param>
-        /// <param name="commandOptions">The command options.</param>
-        /// <param name="dike">The dike.</param>
-        private static void CopySoilData(string projectName, CommandOptions commandOptions, Dike dike)
-        {
-            // Copy soil data
-            string sourceFileName = dike.SoilDatabaseName;
-            string soilDatabaseName = sourceFileName;
-            if (!string.IsNullOrWhiteSpace(soilDatabaseName))
-            {
-                string fileName = Path.GetFileName(sourceFileName);
-                if (fileName != null)
-                {
-                    // creates "ProjectName0.soildatabase.mdb"
-                    string destFile = projectName + "0." + fileName;
-                    string destFilePath = Path.Combine(commandOptions.OuputDataDirectory, destFile);
-                    File.Copy(sourceFileName, destFilePath);
-
-                    // update database references
-                    dike.SoilDatabaseName = destFile;
-                    foreach (Location location in dike.Locations)
-                    {
-                        location.SoildatabaseName = destFile;
-                    }
-
-                    Logger.LogInfo("Copying soil database file: " + destFilePath);
-                }
-            }
-        }
-
-        /// <summary>
         /// Copies the sensor data from excel.
         /// </summary>
         /// <param name="sourceFile">The source file.</param>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r4217 -r4235
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 4217)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 4235)
@@ -1056,12 +1056,10 @@
                 File.Delete(importFile);
             }
 
-            using (StreamWriter writer = File.CreateText(importFile))
-            {
-                writer.WriteLine("location_id;dikering_id;surfaceline_id;segment_id;water_height");
-                writer.WriteLine("RK210-560;Actualisatie;RK210-560;1;1.2");
-                writer.WriteLine("RK210-570;Actualisatie;RK210-570;1;2.2");
-            }
+            using StreamWriter writer = File.CreateText(importFile);
+            writer.WriteLine("location_id;dikering_id;surfaceline_id;segment_id;water_height");
+            writer.WriteLine("RK210-560;Actualisatie;RK210-560;1;1.2");
+            writer.WriteLine("RK210-570;Actualisatie;RK210-570;1;2.2");
         }
 
         private void CreateLocationsFileWithoutRiverLevel(string importFile)
@@ -1075,12 +1073,10 @@
                 File.Delete(importFile);
             }
 
-            using (StreamWriter writer = File.CreateText(importFile))
-            {
-                writer.WriteLine("location_id;dikering_id;surfaceline_id;segment_id;polderlevel");
-                writer.WriteLine("RK210-560;Actualisatie;RK210-560;1;1.2");
-                writer.WriteLine("RK210-570;Actualisatie;RK210-570;1;2.2");
-            }
+            using StreamWriter writer = File.CreateText(importFile);
+            writer.WriteLine("location_id;dikering_id;surfaceline_id;segment_id;polderlevel");
+            writer.WriteLine("RK210-560;Actualisatie;RK210-560;1;1.2");
+            writer.WriteLine("RK210-570;Actualisatie;RK210-570;1;2.2");
         }
 
         private void CreateScenariosFileWithRiverLevel(string importFile)
@@ -1093,12 +1089,10 @@
                 File.Delete(importFile);
             }
 
-            using (StreamWriter writer = File.CreateText(importFile))
-            {
-                writer.WriteLine("location_id;location_scenario_id;water_height;polderlevel");
-                writer.WriteLine("RK210-560;1;0.1;3.14");
-                writer.WriteLine("RK210-570;1;0.2;3.14");
-            }
+            using StreamWriter writer = File.CreateText(importFile);
+            writer.WriteLine("location_id;location_scenario_id;water_height;polderlevel");
+            writer.WriteLine("RK210-560;1;0.1;3.14");
+            writer.WriteLine("RK210-570;1;0.2;3.14");
         }
 
         private void CreateScenariosFileWithoutRiverLevel(string importFile)
@@ -1111,25 +1105,10 @@
                 File.Delete(importFile);
             }
 
-            using (StreamWriter writer = File.CreateText(importFile))
-            {
-                writer.WriteLine("location_id;location_scenario_id;polderlevel");
-                writer.WriteLine("RK210-560;1;3.14");
-                writer.WriteLine("RK210-570;1;3.14");
-            }
+            using StreamWriter writer = File.CreateText(importFile);
+            writer.WriteLine("location_id;location_scenario_id;polderlevel");
+            writer.WriteLine("RK210-560;1;3.14");
+            writer.WriteLine("RK210-570;1;3.14");
         }
-        
-        private static void CreateDatasourceFile(string filePath)
-        {
-            using StreamWriter writer = File.CreateText(filePath);
-            
-            writer.WriteLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
-            writer.WriteLine("<DatasourceContainer Key=\"1\">");
-            writer.WriteLine("  <DataSourceList>");
-            writer.WriteLine("    <DataSource Key=\"2\" DataSourceType=\"CsvFiles\" DataLocation=\"DAM invoerfiles\\\" />");
-            writer.WriteLine("    <DataSource Key=\"3\" DataSourceType=\"MSoilBase\" DataLocation=\"DAM invoerfiles\\soilmaterials.mdb\" />");
-            writer.WriteLine("  </DataSourceList>");
-            writer.WriteLine("</DatasourceContainer>");
-        }
     }
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r4210 -r4235
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 4210)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 4235)
@@ -717,7 +717,6 @@
                 "SheetPilePointY",
                 "SheetPilePointZ",
                 "LocalXZSheetPilePoint",
-                "SoilbaseDB",
                 "SoildatabaseName",
                 "WaterBoardJob",
                 "LocationJobs",
@@ -1061,7 +1060,6 @@
                 var location = new Location();
                 location.Name = "Location " + (i + 1);
                 location.XSoilGeometry2DOrigin = 1.0 * i + 0.01;
-                location.SoildatabaseName = "ASoildb.mdb";
                 location.PLLineCreationMethod = (PLLineCreationMethod) i;
                 location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i;
                 location.DampingFactorPL4 = 1.0 * i + 0.12;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs
===================================================================
diff -u -r4216 -r4235
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4216)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4235)
@@ -266,7 +266,7 @@
         // Delete all locations without surfaceline
         logMessages.AddRange(DeleteLocationsWithoutSurfaceLines());
         // Delete all locations that have profiles (in their segment) which hold soils 
-        // that are not in the soil database and so have no parameters.
+        // that are not in the soil csv-file and so have no parameters.
         logMessages.AddRange(DeleteLocationsWithProfilesWithUnknownSoils(errorSoils));
         return logMessages;
     }
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs
===================================================================
diff -u -r4070 -r4235
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 4235)
@@ -566,7 +566,6 @@
                 "SheetPilePointY",
                 "SheetPilePointZ",
                 "LocalXZSheetPilePoint",
-                "SoilbaseDB",
                 "SurfaceLine",
                 "LocalXZSurfaceLine",
                 "SoilLayer1D",