Index: dam clients/DamUI/trunk/src/Dam/Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs	(.../FailureMechanismeParamatersMStabXmlHandler.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs	(.../FailureMechanismeParamatersMStabXmlHandler.cs)	(revision 341)
@@ -23,7 +23,6 @@
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.Converter;
 using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Standard;
 using Deltares.Standard.IO.Xml;
 using Deltares.Standard.Reflection;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/Sensors/Specifications/PolderLevelSensorSpecification.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Sensors/Specifications/PolderLevelSensorSpecification.cs	(.../PolderLevelSensorSpecification.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Sensors/Specifications/PolderLevelSensorSpecification.cs	(.../PolderLevelSensorSpecification.cs)	(revision 341)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using Deltares.Geotechnics;
 using Deltares.Standard.Specifications;
 
 namespace Deltares.Dam.Data.Sensors.Specifications
Index: dam clients/DamUI/trunk/src/Dam/Application/Program.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Application/Program.cs	(.../Program.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Application/Program.cs	(.../Program.cs)	(revision 341)
@@ -21,12 +21,8 @@
 
 using System;
 using System.Drawing;
-using System.Reflection;
-using Deltares.Authorization;
-using Deltares.Dam.Data.DataPlugins;
 using Deltares.Dam.Data.License;
 using Deltares.Dam.Forms;
-using Deltares.Dam.Data;
 using Deltares.Geometry.Forms;
 using Deltares.Geotechnics.Forms;
 using Deltares.Standard;
Index: dam clients/DamUI/trunk/src/Dam/Data/ThrowHelper.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/ThrowHelper.cs	(.../ThrowHelper.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/ThrowHelper.cs	(.../ThrowHelper.cs)	(revision 341)
@@ -18,16 +18,16 @@
 // 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.
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Resources;
+using System.Reflection;
+using System.Globalization;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Resources;
-    using System.Reflection;
-    using System.Globalization;
 
     /// <summary>
     /// Declares the string resource names
Index: dam clients/DamUI/trunk/src/Dam/Data/ApplicationLogger.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/ApplicationLogger.cs	(.../ApplicationLogger.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/ApplicationLogger.cs	(.../ApplicationLogger.cs)	(revision 341)
@@ -24,7 +24,6 @@
     using System;
     using System.Diagnostics;
     using System.IO;
-    using Deltares.Dam.Data;
 
     public class ApplicationLogger
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/DamJob.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DamJob.cs	(.../DamJob.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamJob.cs	(.../DamJob.cs)	(revision 341)
@@ -19,12 +19,7 @@
 // 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.Linq;
-using System.Text;
-using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/PipingResults.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/PipingResults.cs	(.../PipingResults.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/PipingResults.cs	(.../PipingResults.cs)	(revision 341)
@@ -21,8 +21,6 @@
 
 namespace Deltares.Dam.Data
 {
-    using System;
-
     public struct PipingResults
     {
         public string CalculationName { get; set; }
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterHelper.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterHelper.cs	(.../CsvImporterHelper.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterHelper.cs	(.../CsvImporterHelper.cs)	(revision 341)
@@ -20,9 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Deltares.Standard.Language;
 using LumenWorks.Framework.IO.Csv;
 
Fisheye: Tag 341 refers to a dead (removed) revision in file `dam clients/DamUI/trunk/src/Dam/Forms/Publisher.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvExporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvExporter.cs	(.../CsvExporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvExporter.cs	(.../CsvExporter.cs)	(revision 341)
@@ -19,14 +19,15 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Globalization;
+using System.Reflection;
+
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Globalization;
-    using System.Reflection;
 
     public class CsvExporter<T>
     {
Index: dam clients/DamUI/trunk/src/Dam/Forms/RedesignedSurfaceLineDrawingObject.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Forms/RedesignedSurfaceLineDrawingObject.cs	(.../RedesignedSurfaceLineDrawingObject.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Forms/RedesignedSurfaceLineDrawingObject.cs	(.../RedesignedSurfaceLineDrawingObject.cs)	(revision 341)
@@ -24,7 +24,6 @@
 using Deltares.Geometry;
 using Deltares.Geometry.Forms;
 using Deltares.Mathematics;
-using Deltares.Standard;
 using Deltares.Standard.Forms;
 
 namespace Deltares.Dam.Forms
Index: dam clients/DamUI/trunk/src/Dam/Data/FileWriterUtil.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/FileWriterUtil.cs	(.../FileWriterUtil.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/FileWriterUtil.cs	(.../FileWriterUtil.cs)	(revision 341)
@@ -18,11 +18,10 @@
 // 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.
+using System.IO;
 
 namespace Deltares.Dam.Data
 {
-    using System.IO;
-
     public static class FileWriterUtil
     {
         public static void RemoveThreeBytesFromXml(string outputFilename)
Index: dam clients/DamUI/trunk/src/Dam/Data/MStabResults.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/MStabResults.cs	(.../MStabResults.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/MStabResults.cs	(.../MStabResults.cs)	(revision 341)
@@ -19,20 +19,10 @@
 // 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 System.Threading.Tasks;
 using Deltares.Geotechnics.SurfaceLines;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-    using System.Text;
-
     public struct MStabResults
     {
         public MStabResultsSingleZone zone1;
Index: dam clients/DamUI/trunk/src/Dam/Data/MStabParameters.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 341)
@@ -21,17 +21,12 @@
 
 using System.ComponentModel;
 using System.Xml.Serialization;
-using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Validation;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
     using Deltares.Standard;
 
     public enum TangentLinesDefinition
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvExportSurfaceLineIdentifiers.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvExportSurfaceLineIdentifiers.cs	(.../CsvExportSurfaceLineIdentifiers.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvExportSurfaceLineIdentifiers.cs	(.../CsvExportSurfaceLineIdentifiers.cs)	(revision 341)
@@ -19,11 +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.Linq;
-using System.Text;
-
 namespace Deltares.Dam.Data
 {
     public class CsvExportSurfaceLineIdentifiers
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvExportCharacteristicPoints.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvExportCharacteristicPoints.cs	(.../CsvExportCharacteristicPoints.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvExportCharacteristicPoints.cs	(.../CsvExportCharacteristicPoints.cs)	(revision 341)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.SurfaceLines;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Data/DupuitPLLines.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DupuitPLLines.cs	(.../DupuitPLLines.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DupuitPLLines.cs	(.../DupuitPLLines.cs)	(revision 341)
@@ -18,13 +18,10 @@
 // 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.
+using System.Collections.Generic;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
 
     public class DupuitPLLines
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorFactory.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorFactory.cs	(.../SensorFactory.cs)	(revision 341)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using Deltares.Standard;
 using Deltares.Standard.Extensions;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/Exporters/IScenarioExporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Exporters/IScenarioExporter.cs	(.../IScenarioExporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Exporters/IScenarioExporter.cs	(.../IScenarioExporter.cs)	(revision 341)
@@ -19,10 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
-using System.IO;
-using Deltares.Dam.Data.IO;
-
 namespace Deltares.Dam.Data.Exporters
 {
     public interface IScenarioExporter
Index: dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs	(.../Scenario.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Scenario.cs	(.../Scenario.cs)	(revision 341)
@@ -22,7 +22,6 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Xml.Serialization;
-using Deltares.Geotechnics;
 using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Language;
Index: dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorCalculationArgument.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorCalculationArgument.cs	(.../SensorCalculationArgument.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorCalculationArgument.cs	(.../SensorCalculationArgument.cs)	(revision 341)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
-
 namespace Deltares.Dam.Data.Sensors
 {
     public class SensorCalculationArgument
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/csvImporterException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/csvImporterException.cs	(.../csvImporterException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/csvImporterException.cs	(.../csvImporterException.cs)	(revision 341)
@@ -20,9 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Deltares.Dam.Data.CsvImporters
 {
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterCharacteristicPoints.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterCharacteristicPoints.cs	(.../CsvImporterCharacteristicPoints.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterCharacteristicPoints.cs	(.../CsvImporterCharacteristicPoints.cs)	(revision 341)
@@ -21,12 +21,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Standard.IO;
 using Deltares.Standard.Language;
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterScenarios.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterScenarios.cs	(.../CsvImporterScenarios.cs)	(revision 341)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
Index: dam clients/DamUI/trunk/src/Dam/Data/DikeCoordinateSystemConverter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DikeCoordinateSystemConverter.cs	(.../DikeCoordinateSystemConverter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DikeCoordinateSystemConverter.cs	(.../DikeCoordinateSystemConverter.cs)	(revision 341)
@@ -21,13 +21,11 @@
 
 using System.Linq;
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.SurfaceLines;
 
 namespace Deltares.Dam.Data
 {
     using System;
-    using System.Collections.Generic;
 
     /// <summary>
     /// Exception class for DikeCoordinateSystemConverter
Index: dam clients/DamUI/trunk/src/Dam/Data/SoilGeometry.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/SoilGeometry.cs	(.../SoilGeometry.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/SoilGeometry.cs	(.../SoilGeometry.cs)	(revision 341)
@@ -19,16 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Deltares.Geotechnics;
+using System;
 using Deltares.Geotechnics.Soils;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using Deltares.Soilbase;
 
     /// <summary>
     /// Exception class for SoilGeometry
Index: dam clients/DamUI/trunk/src/Dam/Data/SchematizationFactor/SchematizationFactorData.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/SchematizationFactor/SchematizationFactorData.cs	(.../SchematizationFactorData.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/SchematizationFactor/SchematizationFactorData.cs	(.../SchematizationFactorData.cs)	(revision 341)
@@ -19,12 +19,7 @@
 // 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.Linq;
-using System.Text;
-using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Validation;
Index: dam clients/DamUI/trunk/src/Dam/Forms/SurfaceLineDrawingObject.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Forms/SurfaceLineDrawingObject.cs	(.../SurfaceLineDrawingObject.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Forms/SurfaceLineDrawingObject.cs	(.../SurfaceLineDrawingObject.cs)	(revision 341)
@@ -24,7 +24,6 @@
 using Deltares.Geometry;
 using Deltares.Geometry.Forms;
 using Deltares.Mathematics;
-using Deltares.Standard;
 using Deltares.Standard.Forms;
 
 namespace Deltares.Dam.Forms
Index: dam clients/DamUI/trunk/src/Dam/Data/JobResultInterpreter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/JobResultInterpreter.cs	(.../JobResultInterpreter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/JobResultInterpreter.cs	(.../JobResultInterpreter.cs)	(revision 341)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Drawing;
-using Deltares.Standard;
 
 namespace Deltares.Dam.Data
 {
Index: dam clients/DamUI/trunk/src/Dam/Data/Geometry2DSectionParameters.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Geometry2DSectionParameters.cs	(.../Geometry2DSectionParameters.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Geometry2DSectionParameters.cs	(.../Geometry2DSectionParameters.cs)	(revision 341)
@@ -19,14 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Deltares.Geotechnics;
+using Deltares.Standard;
 using Deltares.Geotechnics.Soils;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using Deltares.Standard;
-    using Deltares.Soilbase;
 
 
     /// <summary>
Index: dam clients/DamUI/trunk/src/Dam/Data/SoilGeometry2DName.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/SoilGeometry2DName.cs	(.../SoilGeometry2DName.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/SoilGeometry2DName.cs	(.../SoilGeometry2DName.cs)	(revision 341)
@@ -19,11 +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.Linq;
-using System.Text;
-
 namespace Deltares.Dam.Data
 {
     public class SoilGeometry2DName
Index: dam clients/DamUI/trunk/src/Dam/Data/TimeSerie.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/TimeSerie.cs	(.../TimeSerie.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/TimeSerie.cs	(.../TimeSerie.cs)	(revision 341)
@@ -18,11 +18,11 @@
 // 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.
+using System;
+using System.Collections.Generic;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
 
     public class TimeSerie
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterLocations.cs	(.../CsvImporterLocations.cs)	(revision 341)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using Deltares.Dam.Data.Importers;
 using Deltares.Probabilistic;
Index: dam clients/DamUI/trunk/src/Dam/Data/NonExistentLocationException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/NonExistentLocationException.cs	(.../NonExistentLocationException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/NonExistentLocationException.cs	(.../NonExistentLocationException.cs)	(revision 341)
@@ -18,11 +18,10 @@
 // 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.
+using System;
 
 namespace Deltares.Dam.Data
 {
-using System;
-using System.Runtime.Serialization;
 
     [Serializable]
     public class NonExistentLocationException : Exception
Index: dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationShapeFileAttributeMap.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationShapeFileAttributeMap.cs	(.../LocationShapeFileAttributeMap.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationShapeFileAttributeMap.cs	(.../LocationShapeFileAttributeMap.cs)	(revision 341)
@@ -22,8 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Deltares.Dam.Data.DataPlugins.Configuration;
-using Deltares.Standard;
 using Deltares.Standard.Extensions;
 using DataAttribute = Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/SurfaceLineCsvColumnNames.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/SurfaceLineCsvColumnNames.cs	(.../SurfaceLineCsvColumnNames.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/SurfaceLineCsvColumnNames.cs	(.../SurfaceLineCsvColumnNames.cs)	(revision 341)
@@ -19,11 +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.Linq;
-using System.Text;
-
 namespace Deltares.Dam.Data.CsvImporters
 {
     /// <summary>
Index: dam clients/DamUI/trunk/src/Dam/Data/PointNotExistsException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/PointNotExistsException.cs	(.../PointNotExistsException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/PointNotExistsException.cs	(.../PointNotExistsException.cs)	(revision 341)
@@ -19,14 +19,13 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using System.Runtime.Serialization;
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.SurfaceLines;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Runtime.Serialization;
 
     [Serializable]
     public class PointNotExistsException : Exception
Index: dam clients/DamUI/trunk/src/Dam/Data/PLLine.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/PLLine.cs	(.../PLLine.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/PLLine.cs	(.../PLLine.cs)	(revision 341)
@@ -19,15 +19,15 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
+using System;
 using System.Linq;
 using System.Xml.Serialization;
+using Deltares.Standard;
 using Deltares.Geometry;
 
 namespace Deltares.Dam.Data
 {
-    using System.Collections.Generic;
-    using System;
-    using Deltares.Standard;
 
     public class PLLinePoint : GeometryPoint
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWResult.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWResult.cs	(.../RWResult.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWResult.cs	(.../RWResult.cs)	(revision 341)
@@ -19,12 +19,7 @@
 // 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 Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
Index: dam clients/DamUI/trunk/src/Dam/Data/EntityFactoryException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/EntityFactoryException.cs	(.../EntityFactoryException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/EntityFactoryException.cs	(.../EntityFactoryException.cs)	(revision 341)
@@ -18,11 +18,11 @@
 // 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.
+using System;
+using System.Runtime.Serialization;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Runtime.Serialization;
 
     [Serializable]
     public class EntityFactoryException : Exception
Index: dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 341)
@@ -182,7 +182,6 @@
     <Compile Include="LocationScenariosControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Publisher.cs" />
     <Compile Include="RedesignedSurfaceLineDrawingObject.cs" />
     <Compile Include="SchematizationFactorPropertyControl.cs">
       <SubType>UserControl</SubType>
@@ -282,6 +281,7 @@
     <EmbeddedResource Include="LocationChart.resx">
       <DependentUpon>LocationChart.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
Index: dam clients/DamUI/trunk/src/Dam/Data/TimeSeriesProcessor.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/TimeSeriesProcessor.cs	(.../TimeSeriesProcessor.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/TimeSeriesProcessor.cs	(.../TimeSeriesProcessor.cs)	(revision 341)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Deltares.Standard.Application;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx
===================================================================
diff -u
--- dam clients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx	(revision 0)
+++ dam clients/DamUI/trunk/src/Dam/Forms/Properties/licenses.licx	(revision 341)
@@ -0,0 +1,6 @@
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v12.2.UI, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
Index: dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationImportHelper.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationImportHelper.cs	(.../LocationImportHelper.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationImportHelper.cs	(.../LocationImportHelper.cs)	(revision 341)
@@ -21,10 +21,8 @@
 
 using System;
 using System.Collections.Generic;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Probabilistic;
-using Deltares.Standard;
 using Deltares.Standard.Extensions;
 
 namespace Deltares.Dam.Data.Importers
Index: dam clients/DamUI/trunk/src/Dam/Data/ModelFactors.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/ModelFactors.cs	(.../ModelFactors.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/ModelFactors.cs	(.../ModelFactors.cs)	(revision 341)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.ComponentModel;
 using System.Xml.Serialization;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Data/Sensors/Specifications/WaterLevelSensorSpecification.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Sensors/Specifications/WaterLevelSensorSpecification.cs	(.../WaterLevelSensorSpecification.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Sensors/Specifications/WaterLevelSensorSpecification.cs	(.../WaterLevelSensorSpecification.cs)	(revision 341)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using Deltares.Geotechnics;
 using Deltares.Standard.Specifications;
 
 namespace Deltares.Dam.Data.Sensors.Specifications
Index: dam clients/DamUI/trunk/src/Dam/Data/IO/CombineImportedData.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/IO/CombineImportedData.cs	(.../CombineImportedData.cs)	(revision 341)
@@ -25,12 +25,10 @@
 
 using Deltares.Dam.Data.CsvImporters;
 using Deltares.Dam.Data.Importers;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Exception;
 using Deltares.Geotechnics.GeotechnicalGeometry;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Standard;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Language;
 using Deltares.Standard.Logging;
Index: dam clients/DamUI/trunk/src/Dam/Data/DamProject.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DamProject.cs	(.../DamProject.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamProject.cs	(.../DamProject.cs)	(revision 341)
@@ -24,7 +24,6 @@
 using System.Globalization;
 using System.Linq;
 using Deltares.Dam.Data.DataPlugins.Configuration;
-using Deltares.Geotechnics;
 using Deltares.Soilbase;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.IO.DtoAssembler;
Index: dam clients/DamUI/trunk/src/Dam/Data/ParameterMissingException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/ParameterMissingException.cs	(.../ParameterMissingException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/ParameterMissingException.cs	(.../ParameterMissingException.cs)	(revision 341)
@@ -18,11 +18,11 @@
 // 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.
+using System;
+using System.Runtime.Serialization;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Runtime.Serialization;
 
     [Serializable]
     public class ParameterMissingException : Exception
Index: dam clients/DamUI/trunk/src/Dam/Data/WaterBoardJob.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/WaterBoardJob.cs	(.../WaterBoardJob.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/WaterBoardJob.cs	(.../WaterBoardJob.cs)	(revision 341)
@@ -21,10 +21,6 @@
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
     public class WaterBoardJob : CompositeJob
     {
         public WaterBoardJob()
Index: dam clients/DamUI/trunk/src/Dam/Data/Location.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Location.cs	(.../Location.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Location.cs	(.../Location.cs)	(revision 341)
@@ -30,7 +30,6 @@
 using Deltares.Dam.Data.Sensors;
 using Deltares.Geographic;
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Converter;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
Index: dam clients/DamUI/trunk/src/Dam/Data/TimeSerieSchemaValidationException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/TimeSerieSchemaValidationException.cs	(.../TimeSerieSchemaValidationException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/TimeSerieSchemaValidationException.cs	(.../TimeSerieSchemaValidationException.cs)	(revision 341)
@@ -18,11 +18,11 @@
 // 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.
+using System;
+using System.Runtime.Serialization;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Runtime.Serialization;
 
     [Serializable]
     public class TimeSerieSchemaValidationException : Exception
Index: dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationShapeFileImporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationShapeFileImporter.cs	(.../LocationShapeFileImporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationShapeFileImporter.cs	(.../LocationShapeFileImporter.cs)	(revision 341)
@@ -25,7 +25,6 @@
 using System.Linq;
 using Deltares.Dam.Data.DataPlugins.Configuration;
 using Deltares.Maps;
-using GeoAPI.Geometries;
 
 namespace Deltares.Dam.Data.Importers
 {
Index: dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/ParseErrorAction.cs
===================================================================
diff -u -r236 -r341
--- dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/ParseErrorAction.cs	(.../ParseErrorAction.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/ParseErrorAction.cs	(.../ParseErrorAction.cs)	(revision 341)
@@ -19,8 +19,6 @@
 //	FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 //	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-using System;
-
 namespace LumenWorks.Framework.IO.Csv
 {
 	/// <summary>
Index: dam clients/DamUI/trunk/src/Dam/Data/Sensors/Group.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Sensors/Group.cs	(.../Group.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Sensors/Group.cs	(.../Group.cs)	(revision 341)
@@ -24,7 +24,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Xml.Serialization;
-using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.IO.Xml;
Index: dam clients/DamUI/trunk/src/Dam/Data/LocationJob.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/LocationJob.cs	(.../LocationJob.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/LocationJob.cs	(.../LocationJob.cs)	(revision 341)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Linq;
 using Deltares.Geographic;
 using Deltares.Standard.Attributes;
Index: dam clients/DamUI/trunk/src/Maps/IAttributeImporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Maps/IAttributeImporter.cs	(.../IAttributeImporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Maps/IAttributeImporter.cs	(.../IAttributeImporter.cs)	(revision 341)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Deltares.Maps
 {
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterSoilProfiles.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterSoilProfiles.cs	(.../CsvImporterSoilProfiles.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterSoilProfiles.cs	(.../CsvImporterSoilProfiles.cs)	(revision 341)
@@ -21,10 +21,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using Deltares.Standard.IO;
 using Deltares.Standard.Language;
Index: dam clients/DamUI/trunk/src/Dam/Data/Importers/LineAttributeImporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Importers/LineAttributeImporter.cs	(.../LineAttributeImporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Importers/LineAttributeImporter.cs	(.../LineAttributeImporter.cs)	(revision 341)
@@ -27,7 +27,6 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using Deltares.Maps;
-using Deltares.Standard;
 
 namespace Deltares.Dam.Data.Importers
 {
Index: dam clients/DamUI/trunk/src/Dam/Data/Geometry2DBoundaryLine.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Geometry2DBoundaryLine.cs	(.../Geometry2DBoundaryLine.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Geometry2DBoundaryLine.cs	(.../Geometry2DBoundaryLine.cs)	(revision 341)
@@ -20,10 +20,10 @@
 // All rights reserved.
 
 using Deltares.Geometry;
+using Deltares.Standard;
 
 namespace Deltares.Dam.Data
 {
-    using Deltares.Standard;
 
     public class Geometry2DPoint : GeometryPoint
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/DamProjectSettings.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DamProjectSettings.cs	(.../DamProjectSettings.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamProjectSettings.cs	(.../DamProjectSettings.cs)	(revision 341)
@@ -19,11 +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.Linq;
-using System.Text;
-
 namespace Deltares.Dam.Data
 {
     public class DamProjectSettings
Index: dam clients/DamUI/trunk/src/Dam/Forms/DamMapEditor.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Forms/DamMapEditor.cs	(.../DamMapEditor.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Forms/DamMapEditor.cs	(.../DamMapEditor.cs)	(revision 341)
@@ -26,13 +26,10 @@
 using System.Windows.Forms;
 using Deltares.Dam.Data;
 using Deltares.Geographic;
-using Deltares.Standard;
 using Deltares.Standard.Forms.DExpress;
 using Deltares.Standard.Forms.Maps;
-using Deltares.Standard.Language;
 using Deltares.Standard.Maps;
 using Deltares.Standard.Logging;
-using DevExpress.Utils.OAuth.Provider;
 using DotSpatial.Data;
 using DotSpatial.Projections;
 using DotSpatial.Symbology;
Index: dam clients/DamUI/trunk/src/Dam/Data/Geometry2DData.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Geometry2DData.cs	(.../Geometry2DData.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Geometry2DData.cs	(.../Geometry2DData.cs)	(revision 341)
@@ -20,12 +20,11 @@
 // All rights reserved.
 
 using System.Collections.Generic;
+using System;
 using Deltares.Standard.Extensions;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using Standard;
 
     public struct Geometry2DLayer
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/DikeJob.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DikeJob.cs	(.../DikeJob.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DikeJob.cs	(.../DikeJob.cs)	(revision 341)
@@ -23,10 +23,6 @@
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
     public class DikeJob : CompositeJob
     {
         public DikeJob()
Index: dam clients/DamUI/trunk/src/Dam/Data/UpliftFactorToBetaCalculator.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/UpliftFactorToBetaCalculator.cs	(.../UpliftFactorToBetaCalculator.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/UpliftFactorToBetaCalculator.cs	(.../UpliftFactorToBetaCalculator.cs)	(revision 341)
@@ -18,10 +18,10 @@
 // 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.
+using System;
 
 namespace Deltares.Dam.Data
 {
-    using System;
 
     /// <summary>
     /// Exception class for UpliftFactorToBetaCalculator
Index: dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorRepository.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorRepository.cs	(.../SensorRepository.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorRepository.cs	(.../SensorRepository.cs)	(revision 341)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using Deltares.Standard;
 using Deltares.Standard.Extensions;
 
 namespace Deltares.Dam.Data.Sensors
Index: dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 341)
@@ -27,7 +27,6 @@
 using Deltares.Dam.Data.CsvImporters;
 using Deltares.Dam.Data.IO;
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
Index: dam clients/DamUI/trunk/src/Dam/Data/TimeStep.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/TimeStep.cs	(.../TimeStep.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/TimeStep.cs	(.../TimeStep.cs)	(revision 341)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Xml.Serialization;
-
 namespace Deltares.Dam.Data
 {
     public class TimeStep
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvParserException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvParserException.cs	(.../CsvParserException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvParserException.cs	(.../CsvParserException.cs)	(revision 341)
@@ -18,11 +18,11 @@
 // 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.
+using System;
+using System.Runtime.Serialization;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Runtime.Serialization;
 
     [Serializable]
     public class CsvParserException : Exception
Index: dam clients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs	(.../DamSpatialEditorDecorator.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs	(.../DamSpatialEditorDecorator.cs)	(revision 341)
@@ -27,7 +27,6 @@
 using Deltares.Dam.Data.Sensors;
 using Deltares.Geometry;
 using Deltares.Geometry.Forms;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Forms;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
Index: dam clients/DamUI/trunk/src/Dam/Data/Assemblers/TimeSeriesAssembler.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Assemblers/TimeSeriesAssembler.cs	(.../TimeSeriesAssembler.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Assemblers/TimeSeriesAssembler.cs	(.../TimeSeriesAssembler.cs)	(revision 341)
@@ -21,8 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Deltares.Standard;
 using System.Reflection;
 using System.Xml.Linq;
Index: dam clients/DamUI/trunk/src/Dam/Data/NonWaterRetainingObject.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/NonWaterRetainingObject.cs	(.../NonWaterRetainingObject.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/NonWaterRetainingObject.cs	(.../NonWaterRetainingObject.cs)	(revision 341)
@@ -20,9 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Deltares.Geometry;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Data/Gauge.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Gauge.cs	(.../Gauge.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Gauge.cs	(.../Gauge.cs)	(revision 341)
@@ -18,13 +18,10 @@
 // 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.
+using System;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
 
     public class Gauge
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/GenericLine.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/GenericLine.cs	(.../GenericLine.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/GenericLine.cs	(.../GenericLine.cs)	(revision 341)
@@ -19,15 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Deltares.Geometry;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Deltares.Standard;
-
     public class GenericLineException : Exception
     {
         public GenericLineException(string message) : base(message)
Index: dam clients/DamUI/trunk/src/Dam/Forms/Symbol.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Forms/Symbol.cs	(.../Symbol.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Forms/Symbol.cs	(.../Symbol.cs)	(revision 341)
@@ -24,7 +24,6 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Linq;
-using DevExpress.Utils.Drawing.Helpers;
 
 namespace Deltares.Dam.Forms
 {
Index: dam clients/DamUI/trunk/src/Dam/Data/CompositeJob.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CompositeJob.cs	(.../CompositeJob.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CompositeJob.cs	(.../CompositeJob.cs)	(revision 341)
@@ -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.ComponentModel;
-using System.Linq;
-using System.Text;
-using Deltares.Standard;
 using Deltares.Standard.Attributes;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs	(.../LocationPropertyImporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationPropertyImporter.cs	(.../LocationPropertyImporter.cs)	(revision 341)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Deltares.Maps;
Index: dam clients/DamUI/trunk/src/Dam/Data/OvertoppingErosionCalculator.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/OvertoppingErosionCalculator.cs	(.../OvertoppingErosionCalculator.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/OvertoppingErosionCalculator.cs	(.../OvertoppingErosionCalculator.cs)	(revision 341)
@@ -20,14 +20,11 @@
 // All rights reserved.
 
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.SurfaceLines;
 
 namespace Deltares.Dam.Data
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
     using System.Runtime.Serialization;
 
     [global::System.Serializable]
Index: dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/MissingFieldAction.cs
===================================================================
diff -u -r236 -r341
--- dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/MissingFieldAction.cs	(.../MissingFieldAction.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/MissingFieldAction.cs	(.../MissingFieldAction.cs)	(revision 341)
@@ -19,8 +19,6 @@
 //	FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 //	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-using System;
-
 namespace LumenWorks.Framework.IO.Csv
 {
 	/// <summary>
Index: dam clients/DamUI/trunk/src/Dam/Data/Segment.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Segment.cs	(.../Segment.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Segment.cs	(.../Segment.cs)	(revision 341)
@@ -19,16 +19,15 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Deltares.Geotechnics;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
 using Deltares.Geotechnics.Soils;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Linq;
-    using System.Text;
     
     public class SoilGeometryProbability : IComparable<SoilGeometryProbability>
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 341)
@@ -25,7 +25,6 @@
 using System.Xml.Serialization;
 using Deltares.Geographic;
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Converter;
 using Deltares.Geotechnics.GeotechnicalGeometry;
 using Deltares.Standard;
Index: dam clients/DamUI/trunk/src/Dam/Data/RequiredImportFileNotExistException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/RequiredImportFileNotExistException.cs	(.../RequiredImportFileNotExistException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/RequiredImportFileNotExistException.cs	(.../RequiredImportFileNotExistException.cs)	(revision 341)
@@ -18,11 +18,11 @@
 // 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.
+using System;
+using System.Runtime.Serialization;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Runtime.Serialization;
 
     [Serializable]
     public class RequiredImportFileNotExistException : Exception
Index: dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationCharacteristicPointImporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationCharacteristicPointImporter.cs	(.../LocationCharacteristicPointImporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationCharacteristicPointImporter.cs	(.../LocationCharacteristicPointImporter.cs)	(revision 341)
@@ -25,7 +25,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Maps;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/IDataPlugin.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/IDataPlugin.cs	(.../IDataPlugin.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DataPlugins/IDataPlugin.cs	(.../IDataPlugin.cs)	(revision 341)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections;
 using Deltares.Dam.Data.DataPlugins.Configuration;
 using Deltares.Geometry;
 using Deltares.Standard;
Index: dam clients/DamUI/trunk/src/Dam/Data/SchematizationFactor/RWSchematizationFactorsResult.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/SchematizationFactor/RWSchematizationFactorsResult.cs	(.../RWSchematizationFactorsResult.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/SchematizationFactor/RWSchematizationFactorsResult.cs	(.../RWSchematizationFactorsResult.cs)	(revision 341)
@@ -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.ComponentModel;
-using System.Linq;
-using System.Text;
-using Deltares.Soilbase;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs	(.../SensorImportFromExcelSheet.cs)	(revision 341)
@@ -23,10 +23,8 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.OleDb;
-using System.IO;
 using System.Linq;
 using Deltares.Standard.Extensions;
-using System.Text;
 using Deltares.Standard.Application;
 //using log4net.Config;
 //using log4net.Repository.Hierarchy;
Index: dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/EvaluationJob.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/EvaluationJob.cs	(.../EvaluationJob.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/EvaluationJob.cs	(.../EvaluationJob.cs)	(revision 341)
@@ -19,10 +19,7 @@
 // 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 System.Xml.Serialization;
 using Deltares.Standard;
 using Deltares.Standard.IO.Xml;
Index: dam clients/DamUI/trunk/src/Dam/Data/LocationResult.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/LocationResult.cs	(.../LocationResult.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/LocationResult.cs	(.../LocationResult.cs)	(revision 341)
@@ -19,11 +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.Linq;
-using System.Text;
-using Deltares.Standard;
 using Deltares.Standard.Attributes;
 using Deltares.Standard.EventPublisher;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/DAMEnumerations.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 341)
@@ -20,10 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Deltares.Standard;
 using Deltares.Standard.Attributes;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Data/ObjectMaterializer.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/ObjectMaterializer.cs	(.../ObjectMaterializer.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/ObjectMaterializer.cs	(.../ObjectMaterializer.cs)	(revision 341)
@@ -18,12 +18,12 @@
 // 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.
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
 
     public class ObjectMaterializer<T>
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/BackgroundRepositoryFeature.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/BackgroundRepositoryFeature.cs	(.../BackgroundRepositoryFeature.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/BackgroundRepositoryFeature.cs	(.../BackgroundRepositoryFeature.cs)	(revision 341)
@@ -19,12 +19,7 @@
 // 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.Standard;
 
 namespace Deltares.Dam.Data
 {
Index: dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/CachedCsvReader.CsvPropertyDescriptor.cs
===================================================================
diff -u -r236 -r341
--- dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/CachedCsvReader.CsvPropertyDescriptor.cs	(.../CachedCsvReader.CsvPropertyDescriptor.cs)	(revision 236)
+++ dam clients/DamUI/trunk/src/Tools/LumenWorks.Framework.IO/Csv/CachedCsvReader.CsvPropertyDescriptor.cs	(.../CachedCsvReader.CsvPropertyDescriptor.cs)	(revision 341)
@@ -20,7 +20,6 @@
 //	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 
 namespace LumenWorks.Framework.IO.Csv
Index: dam clients/DamUI/trunk/src/Dam/Data/WaterBoardPostProcessRelativeProfiles.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/WaterBoardPostProcessRelativeProfiles.cs	(.../WaterBoardPostProcessRelativeProfiles.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/WaterBoardPostProcessRelativeProfiles.cs	(.../WaterBoardPostProcessRelativeProfiles.cs)	(revision 341)
@@ -20,11 +20,8 @@
 // All rights reserved.
 
 using System;
-
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Standard;
 using Deltares.Standard.Logging;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationAttributeMapping.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationAttributeMapping.cs	(.../LocationAttributeMapping.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Importers/LocationAttributeMapping.cs	(.../LocationAttributeMapping.cs)	(revision 341)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Deltares.Maps;
 
 namespace Deltares.Dam.Data.Importers
Index: dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWScenariosResult.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWScenariosResult.cs	(.../RWScenariosResult.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/RWScenarios/RWScenariosResult.cs	(.../RWScenariosResult.cs)	(revision 341)
@@ -20,19 +20,13 @@
 // All rights reserved.
 
 
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
 using Deltares.Standard.Attributes;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.ComponentModel;
-    using System.Drawing;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using Deltares.Soilbase;
-    using Deltares.Standard;
 
     public class RWScenariosResult : RWResult
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvParser.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvParser.cs	(.../CsvParser.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvParser.cs	(.../CsvParser.cs)	(revision 341)
@@ -18,15 +18,14 @@
 // 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.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using System.Text.RegularExpressions;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.IO;
-    using System.Text.RegularExpressions;
 
     public static class CsvParser
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvExportSurfaceLine.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvExportSurfaceLine.cs	(.../CsvExportSurfaceLine.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvExportSurfaceLine.cs	(.../CsvExportSurfaceLine.cs)	(revision 341)
@@ -23,7 +23,6 @@
 using System.Text;
 using Deltares.Dam.Data.CsvImporters;
 using Deltares.Geometry;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.SurfaceLines;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Data/WaterBoardImporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/WaterBoardImporter.cs	(.../WaterBoardImporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/WaterBoardImporter.cs	(.../WaterBoardImporter.cs)	(revision 341)
@@ -24,7 +24,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using Deltares.Soilbase;
 using Deltares.Standard.EventPublisher;
 using Deltares.Geotechnics.GeotechnicalGeometry;
 using Deltares.Geotechnics.IO;
@@ -36,7 +35,6 @@
 {
     using DataPlugins.Configuration;
     using DataPlugins;
-    using Geotechnics;
     using Standard;
     using Maps;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorLocation.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 341)
@@ -27,7 +27,6 @@
 using System.Linq.Expressions;
 using System.Xml.Serialization;
 using Deltares.Dam.Data.Sensors.Specifications;
-using Deltares.Geotechnics;
 using Deltares.Geotechnics.SurfaceLines;
 using Deltares.Standard;
 using Deltares.Standard.Attributes;
Index: dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs	(.../DamHelperFunctions.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamHelperFunctions.cs	(.../DamHelperFunctions.cs)	(revision 341)
@@ -20,12 +20,9 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace Deltares.Dam.Data
Index: dam clients/DamUI/trunk/src/Dam/Data/EntityAlreadyExistException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/EntityAlreadyExistException.cs	(.../EntityAlreadyExistException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/EntityAlreadyExistException.cs	(.../EntityAlreadyExistException.cs)	(revision 341)
@@ -20,10 +20,7 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 
 namespace Deltares.Dam.Data
 {
Index: dam clients/DamUI/trunk/src/Dam/Data/TimeSerieCollection.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/TimeSerieCollection.cs	(.../TimeSerieCollection.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/TimeSerieCollection.cs	(.../TimeSerieCollection.cs)	(revision 341)
@@ -19,16 +19,16 @@
 // 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.Xml.Linq;
 using System.IO;
+using Deltares.Dam.Data.Assemblers;
 using Deltares.Standard.Extensions;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Xml.Linq;
-    using Assemblers;
 
     public class TimeSerieCollection
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporter.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporter.cs	(.../CsvImporter.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporter.cs	(.../CsvImporter.cs)	(revision 341)
@@ -22,8 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using Deltares.Standard;
 using Deltares.Standard.Logging;
 
Index: dam clients/DamUI/trunk/src/Dam/Data/TimeSerieEntry.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/TimeSerieEntry.cs	(.../TimeSerieEntry.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/TimeSerieEntry.cs	(.../TimeSerieEntry.cs)	(revision 341)
@@ -19,12 +19,13 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Deltares.Standard.Extensions;
 
 namespace Deltares.Dam.Data
 {
-    using System;
 
+
     public class TimeSerieEntry
     {
         public TimeSerieEntry()
Index: dam clients/DamUI/trunk/src/Dam/Forms/LocalizedMessageBox.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Forms/LocalizedMessageBox.cs	(.../LocalizedMessageBox.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Forms/LocalizedMessageBox.cs	(.../LocalizedMessageBox.cs)	(revision 341)
@@ -20,9 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Deltares.Standard;
 using System.Windows.Forms;
 using Deltares.Standard.Language;
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvExporterException.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvExporterException.cs	(.../CsvExporterException.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvExporterException.cs	(.../CsvExporterException.cs)	(revision 341)
@@ -18,11 +18,11 @@
 // 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.
+using System;
+using System.Runtime.Serialization;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Runtime.Serialization;
 
     [Serializable]
     public class CsvExporterException : Exception
Index: dam clients/DamUI/trunk/src/Dam/Data/FailureMechanismeParamatersMStab.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/FailureMechanismeParamatersMStab.cs	(.../FailureMechanismeParamatersMStab.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/FailureMechanismeParamatersMStab.cs	(.../FailureMechanismeParamatersMStab.cs)	(revision 341)
@@ -19,8 +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.Geotechnics.SurfaceLines;
 using Deltares.Standard;
Index: dam clients/DamUI/trunk/src/Dam/Data/DamGlobalConstants.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/DamGlobalConstants.cs	(.../DamGlobalConstants.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamGlobalConstants.cs	(.../DamGlobalConstants.cs)	(revision 341)
@@ -19,11 +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.Linq;
-using System.Text;
-
 namespace Deltares.Dam.Data
 {
     public static class DamGlobalConstants
Index: dam clients/DamUI/trunk/src/Dam/Data/PL1Line.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/PL1Line.cs	(.../PL1Line.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/PL1Line.cs	(.../PL1Line.cs)	(revision 341)
@@ -19,14 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Deltares.Geometry;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Deltares.Standard;
 
     public class PL1LineException : Exception
     {
Index: dam clients/DamUI/trunk/src/Dam/Data/PLLines.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/PLLines.cs	(.../PLLines.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/PLLines.cs	(.../PLLines.cs)	(revision 341)
@@ -18,13 +18,10 @@
 // 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.
+using System.Collections.Generic;
 
 namespace Deltares.Dam.Data
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
 
     public class PLLines  
     {
Index: dam clients/DamUI/trunk/src/Dam/Forms/SensorDrawingObject.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Forms/SensorDrawingObject.cs	(.../SensorDrawingObject.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Forms/SensorDrawingObject.cs	(.../SensorDrawingObject.cs)	(revision 341)
@@ -24,9 +24,7 @@
 using Deltares.Dam.Data.Sensors;
 using Deltares.Geometry.Forms;
 using Deltares.Mathematics;
-using Deltares.Standard;
 using Deltares.Standard.Forms;
-using Deltares.Standard.Forms.DExpress;
 
 namespace Deltares.Dam.Forms
 {
Index: dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterSegments.cs
===================================================================
diff -u -r339 -r341
--- dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterSegments.cs	(.../CsvImporterSegments.cs)	(revision 339)
+++ dam clients/DamUI/trunk/src/Dam/Data/CsvImporters/CsvImporterSegments.cs	(.../CsvImporterSegments.cs)	(revision 341)
@@ -21,10 +21,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using Deltares.Standard.IO;
 using Deltares.Standard.Language;