Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r4070 -r4216
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 4070)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 4216)
@@ -34,7 +34,6 @@
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Geotechnics.Validation;
-using Deltares.Soilbase;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
@@ -531,21 +530,6 @@
 
     [Browsable(false)] public SoilList SoilList { get; set; }
 
-    [Browsable(false)]
-    [XmlIgnore]
-    public SoilbaseDB SoilbaseDB
-    {
-        get
-        {
-            if (SoildatabaseName == null || !File.Exists(SoildatabaseName))
-            {
-                throw new DikeException($"The soil database '{SoildatabaseName}' cannot be found");
-            }
-
-            return SoilbaseDB.Create(SoildatabaseName);
-        }
-    }
-
     [Browsable(false)] public string MapForSoilGeometries2D { get; set; } = "";
 
     [Browsable(false)] public virtual IList<Gauge> Gauges { get; set; } = new List<Gauge>();
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r4151 -r4216
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 4151)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 4216)
@@ -45,9 +45,6 @@
         <Reference Include="Deltares.Mathematics">
             <HintPath>..\..\..\lib\DSL-Core\Deltares.Mathematics.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Soilbase">
-            <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.Standard">
             <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
         </Reference>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r4177 -r4216
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4177)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 4216)
@@ -32,9 +32,6 @@
         <Reference Include="Deltares.Geotechnics.IO">
             <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Geotechnics.IO.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Soilbase">
-            <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll</HintPath>
-        </Reference>
         <Reference Include="Deltares.Standard">
             <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
         </Reference>
@@ -117,9 +114,6 @@
         <None Update="TestData\CSVData\ImporterTest\surfacelines.csv">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Update="TestData\DamProjectTest\DamProjectTestMSoilbaseRead.mdb">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
         <None Update="TestData\HempolderImport\Lijnscenarios.defx">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r4212 -r4216
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 4212)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 4216)
@@ -26,8 +26,6 @@
 using System.Linq;
 using Deltares.Dam.Data.DataPlugins.Configuration;
 using Deltares.Dam.Data.IO;
-using Deltares.Geotechnics.Soils;
-using Deltares.Soilbase;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.IO;
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r4215 -r4216
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 4215)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 4216)
@@ -132,7 +132,7 @@
     /// <value>
     /// The import log messages.
     /// </value>
-    public List<LogMessage> ImportLogMessages { get; } = new List<LogMessage>();
+    public List<LogMessage> ImportLogMessages { get; } = new ();
 
     /// <summary>
     /// Gets or sets the dam project folder.
@@ -994,6 +994,12 @@
     private string GetDataLocation(DataSource dataSource)
     {
         string dataLocation = dataSource.DataLocation;
+
+        if (dataLocation == null)
+        {
+            throw new DataPluginImporterException("DataLocation is empty. Perhaps the DataSourceType is not supported.");
+        }
+        
         if (!string.IsNullOrEmpty(DataFolder)
             && (!Directory.Exists(dataLocation) || !File.Exists(dataLocation)))
         {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config
===================================================================
diff -u -r4127 -r4216
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config	(.../app.config)	(revision 4127)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/app.config	(.../app.config)	(revision 4216)
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) Stichting Deltares 2021. All rights reserved.
-
-This file is part of the DAM - Clients Library.
-
-The DAM - UI is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-All names, logos, and references to "Deltares" are registered trademarks of
-Stichting Deltares and remain full property of Stichting Deltares at all times.
-All rights reserved.
+<!--
+Copyright (C) Stichting Deltares 2021. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
 -->
 <configuration>
     <configSections>
@@ -50,9 +50,6 @@
             <setting name="ImportFileExtension" serializeAs="String">
                 <value>csv</value>
             </setting>
-            <setting name="SoilDatabaseFile" serializeAs="String">
-                <value>Soilbase\soilbase.mdb</value>
-            </setting>
             <setting name="ModelParametersImportFileName" serializeAs="String">
                 <value>modelparameters</value>
             </setting>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs
===================================================================
diff -u -r4215 -r4216
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4215)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4216)
@@ -30,7 +30,6 @@
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Geotechnics.Validation;
-using Deltares.Soilbase;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.Data;
@@ -89,8 +88,6 @@
 
     public virtual string SoilDatabaseName { get; set; } = "";
 
-    [XmlIgnore] public SoilbaseDB SoilBaseDB { get; set; }
-
     /// <summary>
     ///     Gets the locations.
     /// </summary>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj
===================================================================
diff -u -r4070 -r4216
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 4216)
@@ -22,9 +22,6 @@
         <Reference Include="Deltares.Geotechnics.IO">
             <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Geotechnics.IO.dll</HintPath>
         </Reference>
-        <Reference Include="Deltares.Soilbase">
-            <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll</HintPath>
-        </Reference>
         <Reference Include="System"/>
         <Reference Include="System.Core"/>
     </ItemGroup>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/DamProjectTest/DamProjectTestMSoilbaseRead.mdb
===================================================================
diff -u -r4047 -r4216
Binary files differ