Index: src/Deltares.DSoilModel.Data/CenterCrestLocation.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/CenterCrestLocation.cs	(.../CenterCrestLocation.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/CenterCrestLocation.cs	(.../CenterCrestLocation.cs)	(revision 883)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.ComponentModel;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Data/SosSoilLayer1D.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/SosSoilLayer1D.cs	(.../SosSoilLayer1D.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/SosSoilLayer1D.cs	(.../SosSoilLayer1D.cs)	(revision 883)
@@ -20,9 +20,7 @@
 // All rights reserved.
 
 using System.ComponentModel;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
-using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Units;
Index: src/Deltares.DSoilModel.Data/SoilSegmentFactory.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/SoilSegmentFactory.cs	(.../SoilSegmentFactory.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/SoilSegmentFactory.cs	(.../SoilSegmentFactory.cs)	(revision 883)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.IO;
Index: src/Deltares.DSoilModel.Forms/SoilProfile1DLookup2DControl.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/SoilProfile1DLookup2DControl.cs	(.../SoilProfile1DLookup2DControl.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/SoilProfile1DLookup2DControl.cs	(.../SoilProfile1DLookup2DControl.cs)	(revision 883)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Windows.Forms;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
Index: src/Deltares.DSoilModel.Forms/PreconsolidationStressControl.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/PreconsolidationStressControl.cs	(.../PreconsolidationStressControl.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/PreconsolidationStressControl.cs	(.../PreconsolidationStressControl.cs)	(revision 883)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Windows.Forms;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs	(.../DSoilModelGeometryEditorTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs	(.../DSoilModelGeometryEditorTests.cs)	(revision 883)
@@ -1,5 +1,4 @@
-using System;
-using Deltares.DSoilModel.Data;
+using Deltares.DSoilModel.Data;
 using Deltares.Geometry;
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
Index: src/Deltares.DSoilModel.Forms/FilmStripThumbnail.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/FilmStripThumbnail.cs	(.../FilmStripThumbnail.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/FilmStripThumbnail.cs	(.../FilmStripThumbnail.cs)	(revision 883)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Drawing;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 
 namespace Deltares.DSoilModel.Forms
Index: src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs	(.../FilmStripTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs	(.../FilmStripTest.cs)	(revision 883)
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
-using System.Linq;
 using System.Reflection;
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.TestUtils;
 using Deltares.Standard.Extensions;
Index: src/Deltares.DSoilModel.Forms/CenterCrestLocationPropertyControl.cs
===================================================================
diff -u -r867 -r883
--- src/Deltares.DSoilModel.Forms/CenterCrestLocationPropertyControl.cs	(.../CenterCrestLocationPropertyControl.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Forms/CenterCrestLocationPropertyControl.cs	(.../CenterCrestLocationPropertyControl.cs)	(revision 883)
@@ -19,12 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using Deltares.DSoilModel.Data;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs	(.../CptLookup1DControlTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs	(.../CptLookup1DControlTests.cs)	(revision 883)
@@ -1,5 +1,4 @@
-using Deltares.Geotechnics;
-using Deltares.Geotechnics.ConePenetrationTest;
+using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
Index: src/Deltares.DSoilModel.Data/SosSoilProfilesImporter.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/SosSoilProfilesImporter.cs	(.../SosSoilProfilesImporter.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/SosSoilProfilesImporter.cs	(.../SosSoilProfilesImporter.cs)	(revision 883)
@@ -21,11 +21,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using System.Drawing;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO.Exception;
 using Deltares.Geotechnics.IO.Importers;
 using Deltares.Geotechnics.Soils;
Index: src/Deltares.DSoilModel.Forms/FilmStrip.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/FilmStrip.cs	(.../FilmStrip.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/FilmStrip.cs	(.../FilmStrip.cs)	(revision 883)
@@ -25,10 +25,8 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
-
 using Deltares.DSoilModel.Forms.Properties;
 using Deltares.Geometry.Forms;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.EventPublisher.Enum;
Index: src/Deltares.DSoilModel.Data/SoilSegmentSplitLocation.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/SoilSegmentSplitLocation.cs	(.../SoilSegmentSplitLocation.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/SoilSegmentSplitLocation.cs	(.../SoilSegmentSplitLocation.cs)	(revision 883)
@@ -22,13 +22,12 @@
 using System;
 using System.Xml.Serialization;
 using Deltares.Geographic;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
-using Deltares.Standard.Maps;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Language;
+using Deltares.Standard.Maps;
 using Deltares.Standard.Units;
 
 namespace Deltares.DSoilModel.Data
Index: src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs	(.../SegmentControlTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs	(.../SegmentControlTests.cs)	(revision 883)
@@ -8,7 +8,6 @@
 using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Geotechnics.Xsd;
 using Deltares.Standard.Forms;
-using Deltares.Standard.TestUtils;
 using NUnit.Framework;
 
 namespace Deltares.DSoilModel.Forms.Tests
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs	(.../DSoilModelSegmentGeometryEditorTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs	(.../DSoilModelSegmentGeometryEditorTests.cs)	(revision 883)
@@ -1,6 +1,5 @@
 using Deltares.DSoilModel.Data;
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Data/DSoilModelProject.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/DSoilModelProject.cs	(.../DSoilModelProject.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/DSoilModelProject.cs	(.../DSoilModelProject.cs)	(revision 883)
@@ -36,7 +36,6 @@
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Geotechnics.Xsd;
-using Deltares.Soilbase;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs	(.../CenterCrestLocationPropertyControlTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs	(.../CenterCrestLocationPropertyControlTest.cs)	(revision 883)
@@ -1,5 +1,4 @@
 using Deltares.DSoilModel.Data;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs	(.../SosSoilLayer1DTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs	(.../SosSoilLayer1DTest.cs)	(revision 883)
@@ -25,7 +25,6 @@
 using System.Drawing;
 using System.IO;
 using System.Xml.Serialization;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.EventPublisher;
Index: src/Deltares.DSoilModel.Application/Program.cs
===================================================================
diff -u -r867 -r883
--- src/Deltares.DSoilModel.Application/Program.cs	(.../Program.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Application/Program.cs	(.../Program.cs)	(revision 883)
@@ -27,6 +27,7 @@
 using Deltares.Standard;
 using Deltares.Standard.Forms.DExpress;
 using Deltares.Standard.Language;
+using Deltares.Standard.Reflection;
 using DevExpress.UserSkins;
 
 namespace Deltares.DSoilModel.Application
Index: src/Deltares.DSoilModel.Data/DSoilModelIO.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/DSoilModelIO.cs	(.../DSoilModelIO.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/DSoilModelIO.cs	(.../DSoilModelIO.cs)	(revision 883)
@@ -25,18 +25,17 @@
 using System.Linq;
 using System.Windows.Forms;
 using System.Xml;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.IO.Importers;
 using Deltares.Geotechnics.Soils;
 using Deltares.Soilbase;
 using Deltares.Standard;
-using Deltares.Standard.Maps;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Extensions;
 using Deltares.Standard.IO;
 using Deltares.Standard.Language;
 using Deltares.Standard.Logging;
+using Deltares.Standard.Maps;
 
 namespace Deltares.DSoilModel.Data
 {
Index: src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs
===================================================================
diff -u -r753 -r883
--- src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs	(.../CptControlTests.cs)	(revision 753)
+++ src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs	(.../CptControlTests.cs)	(revision 883)
@@ -1,7 +1,6 @@
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Xsd;
 using Deltares.Standard.Forms;
-using Deltares.Standard.TestUtils;
 using NUnit.Framework;
 
 namespace Deltares.DSoilModel.Forms.Tests
Index: src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs	(.../SpecificMechanismPointLocationControlTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs	(.../SpecificMechanismPointLocationControlTests.cs)	(revision 883)
@@ -1,5 +1,4 @@
-using Deltares.Geotechnics;
-using Deltares.Geotechnics.IO;
+using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.Mechanisms;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Forms/SegmentControl.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/SegmentControl.cs	(.../SegmentControl.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/SegmentControl.cs	(.../SegmentControl.cs)	(revision 883)
@@ -20,9 +20,8 @@
 // All rights reserved.
 
 using System.Windows.Forms;
-using Deltares.Standard;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
+using Deltares.Standard;
 using Deltares.Standard.EventPublisher.Enum;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
Index: src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs	(.../DSoilModelGeometryEditor.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/DSoilModelGeometryEditor.cs	(.../DSoilModelGeometryEditor.cs)	(revision 883)
@@ -33,7 +33,6 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Forms;
-using Deltares.Geotechnics.GeotechnicalGeometry;
 using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs	(.../DSoilModelDataSourceRedirectorTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs	(.../DSoilModelDataSourceRedirectorTests.cs)	(revision 883)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Mechanisms;
 using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
Index: src/Deltares.DSoilModel.Data.Tests/TestFiles/Groot Salland.gdb
===================================================================
diff -u -r414 -r883
Binary files differ
Index: src/Deltares.DSoilModel.Data/DSoilModelTransformer.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/DSoilModelTransformer.cs	(.../DSoilModelTransformer.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/DSoilModelTransformer.cs	(.../DSoilModelTransformer.cs)	(revision 883)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs	(.../DSoilModelIOTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs	(.../DSoilModelIOTest.cs)	(revision 883)
@@ -24,7 +24,6 @@
 using System.Reflection;
 using System.Text;
 using System.Xml;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO.Importers;
 using Deltares.Geotechnics.Mechanisms;
 using Deltares.Geotechnics.Soils;
Index: src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs	(.../SosSoilLayer1DControl.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/SosSoilLayer1DControl.cs	(.../SosSoilLayer1DControl.cs)	(revision 883)
@@ -21,7 +21,6 @@
 
 using System.Windows.Forms;
 using Deltares.DSoilModel.Data;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Forms;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs	(.../CenterCrestLocationTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs	(.../CenterCrestLocationTest.cs)	(revision 883)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Language;
 using Deltares.Standard.TestUtils;
Index: src/GlobalAssemblyInfo.cs
===================================================================
diff -u -r861 -r883
--- src/GlobalAssemblyInfo.cs	(.../GlobalAssemblyInfo.cs)	(revision 861)
+++ src/GlobalAssemblyInfo.cs	(.../GlobalAssemblyInfo.cs)	(revision 883)
@@ -1,4 +1,4 @@
-using System.Reflection; 
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyProduct("D-Soil Model")] 
Index: src/Deltares.DSoilModel.Forms/SosSoilProfile1DControl.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/SosSoilProfile1DControl.cs	(.../SosSoilProfile1DControl.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/SosSoilProfile1DControl.cs	(.../SosSoilProfile1DControl.cs)	(revision 883)
@@ -21,7 +21,6 @@
 
 using System.Windows.Forms;
 using Deltares.DSoilModel.Data;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.EventPublisher.Enum;
 using Deltares.Standard.Forms;
Index: src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs	(.../CptLookup2DControlTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs	(.../CptLookup2DControlTests.cs)	(revision 883)
@@ -1,5 +1,4 @@
-using Deltares.Geotechnics;
-using Deltares.Geotechnics.ConePenetrationTest;
+using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
Index: src/Deltares.DSoilModel.Forms/HighlightSoilSegment.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/HighlightSoilSegment.cs	(.../HighlightSoilSegment.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/HighlightSoilSegment.cs	(.../HighlightSoilSegment.cs)	(revision 883)
@@ -19,12 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Deltares.Geographic;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 
 namespace Deltares.DSoilModel.Forms
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs	(.../SosSoilProfilesImporterTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs	(.../SosSoilProfilesImporterTests.cs)	(revision 883)
@@ -21,7 +21,6 @@
 
 using System.Drawing;
 using System.IO;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Logging;
 using NUnit.Framework;
Index: src/Deltares.DSoilModel.Forms/DrawingBoringLayer.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/DrawingBoringLayer.cs	(.../DrawingBoringLayer.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/DrawingBoringLayer.cs	(.../DrawingBoringLayer.cs)	(revision 883)
@@ -25,7 +25,6 @@
 using Deltares.Geotechnics.Forms;
 using Deltares.Geotechnics.Soils;
 using Deltares.Mathematics;
-using Deltares.Standard;
 using Deltares.Standard.Forms;
 
 namespace Deltares.DSoilModel.Forms
Index: src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs	(.../SoilProfile1DLookup2DControlTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs	(.../SoilProfile1DLookup2DControlTest.cs)	(revision 883)
@@ -1,5 +1,4 @@
-using Deltares.Geotechnics;
-using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms/DrawingSosSoilLayer1D.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/DrawingSosSoilLayer1D.cs	(.../DrawingSosSoilLayer1D.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/DrawingSosSoilLayer1D.cs	(.../DrawingSosSoilLayer1D.cs)	(revision 883)
@@ -26,7 +26,6 @@
 using Deltares.DSoilModel.Data;
 using Deltares.Geometry;
 using Deltares.Geometry.Forms;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Mathematics;
 using Deltares.Standard;
Index: src/Deltares.DSoilModel.Data/DSoilModelDataSourceRedirector.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/DSoilModelDataSourceRedirector.cs	(.../DSoilModelDataSourceRedirector.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/DSoilModelDataSourceRedirector.cs	(.../DSoilModelDataSourceRedirector.cs)	(revision 883)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs	(.../DSoilModelTransformerTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs	(.../DSoilModelTransformerTests.cs)	(revision 883)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Reflection;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
Index: src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs	(.../SosSoilLayer1DControlTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs	(.../SosSoilLayer1DControlTests.cs)	(revision 883)
@@ -1,6 +1,5 @@
 using System.Drawing;
 using Deltares.DSoilModel.Data;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
Index: src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs	(.../SosSoilProfile1DControlTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs	(.../SosSoilProfile1DControlTest.cs)	(revision 883)
@@ -1,5 +1,4 @@
 using Deltares.DSoilModel.Data;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
Index: src/Deltares.DSoilModel.Data/DSoilModelStiFileTransformer.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Data/DSoilModelStiFileTransformer.cs	(.../DSoilModelStiFileTransformer.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Data/DSoilModelStiFileTransformer.cs	(.../DSoilModelStiFileTransformer.cs)	(revision 883)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
 using Deltares.Standard;
Index: src/Deltares.DSoilModel.Data.Tests/Properties/AssemblyInfo.cs
===================================================================
diff -u -r867 -r883
--- src/Deltares.DSoilModel.Data.Tests/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 867)
+++ src/Deltares.DSoilModel.Data.Tests/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 883)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
Index: src/Deltares.DSoilModel.Forms/DrawingLayerObsolete.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms/DrawingLayerObsolete.cs	(.../DrawingLayerObsolete.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms/DrawingLayerObsolete.cs	(.../DrawingLayerObsolete.cs)	(revision 883)
@@ -24,7 +24,6 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using Deltares.Geometry.Forms;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Mathematics;
 using Deltares.Standard;
Index: src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs
===================================================================
diff -u -r879 -r883
--- src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs	(.../PreconsolidationStressControlTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs	(.../PreconsolidationStressControlTests.cs)	(revision 883)
@@ -1,5 +1,4 @@
-using Deltares.Geotechnics;
-using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
 
Index: src/Deltares.DSoilModel.Forms.Tests/Properties/AssemblyInfo.cs
===================================================================
diff -u -r861 -r883
--- src/Deltares.DSoilModel.Forms.Tests/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 861)
+++ src/Deltares.DSoilModel.Forms.Tests/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 883)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following