Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r6203 -r6207
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6203)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6207)
@@ -55,225 +55,18 @@
     public const int CpDitchPolderSide = 19; // Insteek sloot polderzijde
     public const int CpSurfaceLevelInside = 25; // Maaiveld binnenwaarts        
 
-    /// <summary>The enumerated constants for input failure mechanism stability inside</summary>
-    public const int InputFailureMechanismStabilityInside = 0;
-
-    public const int InputFailureMechanismStabilityOutside = 1;
-    public const int InputFailureMechanismPiping = 2;
-
-    /// <summary>The enumerated constants for input segment failure mechanism stability inside</summary>
-    public const int InputSegmentFailureMechanismAll = 0;
-
-    public const int InputSegmentFailureMechanismStability = 1;
-    public const int InputSegmentFailureMechanismPiping = 2;
-
     /// <summary>
-    ///     The input zone type no zones
+    /// The uplift type uplift
     /// </summary>
-    public const int InputZoneTypeNoZones = 0;
-
-    /// <summary>
-    ///     The input zone types forbidden zones
-    /// </summary>
-    public const int InputZoneTypesForbiddenZones = 2;
-
-    /// <summary>
-    ///     The input search method grid
-    /// </summary>
-    public const int InputSearchMethodGrid = 0;
-
-    /// <summary>
-    ///     The input search method genetic
-    /// </summary>
-    public const int InputSearchMethodGenetic = 1;
-
-    /// <summary>
-    ///     The input search method bee swarm
-    /// </summary>
-    public const int InputSearchMethodBeeSwarm = 2;
-
-    /// <summary>
-    ///     The input grid type automatic
-    /// </summary>
-    public const int InputGridTypeAutomatic = 0;
-
-    /// <summary>
-    ///     The input grid type specified
-    /// </summary>
-    public const int InputGridTypeSpecified = 1;
-
-    /// <summary>
-    ///     The input tangent lines on boundary lines
-    /// </summary>
-    public const int InputTangentLinesOnBoundaryLines = 0;
-
-    /// <summary>
-    ///     The input tangent lines specified
-    /// </summary>
-    public const int InputTangentLinesSpecified = 1;
-    
-    /// <summary>
-    ///     The input tangent lines automatic
-    /// </summary>
-    public const int InputTangentLinesAutomatic = 2;
-
-    /// <summary>
-    ///     The load situation dry
-    /// </summary>
-    public const int LoadSituationDry = 0;
-
-    /// <summary>
-    ///     The load situation wet
-    /// </summary>
-    public const int LoadSituationWet = 1;
-
-    /// <summary>
-    ///     The dike dry sensitivity none
-    /// </summary>
-    public const int DikeDrySensitivityNone = 0;
-
-    /// <summary>
-    ///     The dike dry sensitivity dry
-    /// </summary>
-    public const int DikeDrySensitivityDry = 1;
-
-    /// <summary>
-    ///     The hydraulic shortcut type hydraulic shortcut
-    /// </summary>
-    public const int HydraulicShortcutTypeHydraulicShortcut = 0;
-
-    /// <summary>
-    ///     The hydraulic shortcut type no hydraulic shortcut
-    /// </summary>
-    public const int HydraulicShortcutTypeNoHydraulicShortcut = 1;
-
-    /// <summary>
-    ///     The uplift type uplift
-    /// </summary>
     public const int UpliftTypeUplift = 0;
 
     /// <summary>
-    ///     The uplift type no uplift
+    /// The uplift type no uplift
     /// </summary>
     public const int UpliftTypeNoUplift = 1;
-
-    /// <summary>
-    ///     The m stab model type bishop
-    /// </summary>
-    public const int MStabModelTypeBishop = 0;
-
-    /// <summary>
-    ///     The m stab model type spencer
-    /// </summary>
-    public const int MStabModelTypeSpencer = 1;
-
-    /// <summary>
-    ///     The m stab model type fellenius
-    /// </summary>
-    public const int MStabModelTypeFellenius = 2;
-
-    /// <summary>
-    ///     The m stab model type uplift van
-    /// </summary>
-    public const int MStabModelTypeUpliftVan = 3;
-
-    /// <summary>
-    ///     The m stab model type uplift spencer
-    /// </summary>
-    public const int MStabModelTypeUpliftSpencer = 4;
-
-    /// <summary>
-    ///     The m stab model type bishop random field
-    /// </summary>
-    public const int MStabModelTypeBishopRandomField = 5;
-
-    /// <summary>
-    ///     The m stab model type bishop uplift van
-    /// </summary>
-    public const int MStabModelTypeBishopUpliftVan = 7;
-
-    /// <summary>
-    ///     The scenario type scenario01
-    /// </summary>
-    public const int ScenarioTypeScenario01 = 0;
-
-    /// <summary>
-    ///     The scenario type scenario02
-    /// </summary>
-    public const int ScenarioTypeScenario02 = 1;
-
-    /// <summary>
-    ///     The scenario type scenario03
-    /// </summary>
-    public const int ScenarioTypeScenario03 = 2;
-
-    /// <summary>
-    ///     The scenario type scenario04
-    /// </summary>
-    public const int ScenarioTypeScenario04 = 3;
-
-    /// <summary>
-    ///     The scenario type scenario05
-    /// </summary>
-    public const int ScenarioTypeScenario05 = 4;
-
-    /// <summary>
-    ///     The scenario type scenario06
-    /// </summary>
-    public const int ScenarioTypeScenario06 = 5;
-
-    /// <summary>
-    ///     The scenario type scenario07
-    /// </summary>
-    public const int ScenarioTypeScenario07 = 6;
-
-    /// <summary>
-    ///     The scenario type scenario08
-    /// </summary>
-    public const int ScenarioTypeScenario08 = 7;
-
-    /// <summary>
-    ///     The scenario type scenario09
-    /// </summary>
-    public const int ScenarioTypeScenario09 = 8;
-
-    /// <summary>
-    ///     The scenario type scenario10
-    /// </summary>
-    public const int ScenarioTypeScenario10 = 9;
-
-    /// <summary>
-    ///     The scenario type scenario11
-    /// </summary>
-    public const int ScenarioTypeScenario11 = 10;
-
-    /// <summary>
-    ///     The piping model type bligh
-    /// </summary>
-    public const int PipingModelTypeBligh = 0;
     
-    /// <summary>
-    /// The piping model type Sellmeijer.
-    /// Obsolete but still present to inform the user when opening an old file with this model.
-    /// </summary>
-    public const int PipingModelTypeSellmeijer = 1;
-    
-    /// <summary>
-    /// The piping model type Sellmeijer 4 forces.
-    /// Obsolete but still present to inform the user when opening an old file with this model.
-    /// </summary>
-    public const int PipingModelTypeSellmeijer4Forces = 2;
-
-    /// <summary>
-    ///     The piping model type wti2017
-    /// </summary>
-    public const int PipingModelTypeWti2017 = 3;
-
-    /// <summary>
-    ///     Constants for translating to Enums TimeStepUnit
-    /// </summary>
+    // Constants for translating to Enums TimeStepUnit
     public const uint TimeStepUnitSecond = 0;
-
     public const uint TimeStepUnitMinute = 1;
     public const uint TimeStepUnitHour = 2;
     public const uint TimeStepUnitDay = 3;
@@ -282,33 +75,24 @@
     public const uint TimeStepUnitYear = 6;
     public const uint TimeStepUnitNonequidistant = 7;
 
-    /// <summary>
-    ///     Constants for translating to Enums PlLineType
-    /// </summary>
+    // Constants for translating to Enums PlLineType
     public const uint PlLineTypePl1 = 1;
-
     public const uint PlLineTypePl2 = 2;
     public const uint PlLineTypePl3 = 3;
     public const uint PlLineTypePl4 = 4;
 
-    /// <summary>
-    ///     Constants for translating to Enums SensorType
-    /// </summary>
+    // Constants for translating to Enums SensorType
     public const uint SensorTypePiezometricHead = 0;
-
     public const uint SensorTypeWaterLevel = 1;
     public const uint SensorTypePolderLevel = 2;
 
-    /// <summary>
-    ///     Constants for translating to Enums DataSourceTypeSensors
-    /// </summary>
+    // Constants for translating to Enums DataSourceTypeSensors
     public const uint DataSourceTypeSensorsIgnore = 0;
-
     public const uint DataSourceTypeSensorsLocationData = 1;
     public const uint DataSourceTypeSensorsSensor = 2;
 
     /// <summary>
-    ///     Converts the type DamProjectType from input object type to Dam Engine type.
+    /// Converts the type DamProjectType from input object type to Dam Engine type.
     /// </summary>
     /// <param name="inputDamProjectType">Type of the input object.</param>
     /// <returns>Dam Engine type</returns>
@@ -1401,48 +1185,10 @@
         };
         return translationTable[stabilityDesignMethod];
     }
-
+    
     /// <summary>
-    ///     Converts to Load Situation.
+    ///  Converts to Uplift Type.
     /// </summary>
-    /// <param name="inputLoadSituation">The input Load Situation.</param>
-    /// <returns></returns>
-    public static LoadSituation ConvertToLoadSituation(int inputLoadSituation)
-    {
-        var translationTable = new Dictionary<int, LoadSituation>
-        {
-            {
-                LoadSituationDry, LoadSituation.Dry
-            },
-            {
-                LoadSituationWet, LoadSituation.Wet
-            }
-        };
-        return translationTable[inputLoadSituation];
-    }
-
-    /// <summary>
-    ///     Converts to output LoadSituation.
-    /// </summary>
-    /// <param name="loadSituation">The Load Situation.</param>
-    /// <returns></returns>
-    public static int ConvertToOutputLoadSituation(LoadSituation loadSituation)
-    {
-        var translationTable = new Dictionary<LoadSituation, int>
-        {
-            {
-                LoadSituation.Dry, LoadSituationDry
-            },
-            {
-                LoadSituation.Wet, LoadSituationWet
-            }
-        };
-        return translationTable[loadSituation];
-    }
-
-    /// <summary>
-    ///     Converts to Uplift Type.
-    /// </summary>
     /// <param name="inputUpliftType">The input UpliftType.</param>
     /// <returns></returns>
     public static UpliftType ConvertToUpliftType(int inputUpliftType)
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs
===================================================================
diff -u -r6204 -r6207
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 6204)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 6207)
@@ -387,22 +387,6 @@
     }
 
     [Test]
-    [TestCase(LoadSituation.Dry, ConversionHelper.LoadSituationDry)]
-    [TestCase(LoadSituation.Wet, ConversionHelper.LoadSituationWet)]
-    public void CanConvertToOutputLoadSituation(LoadSituation loadSituation, int outputLoadSituation)
-    {
-        Assert.That(ConversionHelper.ConvertToOutputLoadSituation(loadSituation), Is.EqualTo(outputLoadSituation));
-    }
-
-    [Test]
-    [TestCase(ConversionHelper.LoadSituationDry, LoadSituation.Dry)]
-    [TestCase(ConversionHelper.LoadSituationWet, LoadSituation.Wet)]
-    public void CanConvertToLoadSituation(int outputLoadSituation, LoadSituation loadSituation)
-    {
-        Assert.That(ConversionHelper.ConvertToLoadSituation(outputLoadSituation), Is.EqualTo(loadSituation));
-    }
-
-    [Test]
     [TestCase(UpliftType.Uplift, ConversionHelper.UpliftTypeUplift)]
     [TestCase(UpliftType.NoUplift, ConversionHelper.UpliftTypeNoUplift)]
     public void CanConvertToOutputUpliftType(UpliftType upliftType, int outputUpliftType)