Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -r5b3c419193fb9029f3ca6c3dbce8e894aeb7f636 -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 5b3c419193fb9029f3ca6c3dbce8e894aeb7f636)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -132,8 +132,8 @@
             }
         }
 
-        private static void AddHydraulicLocationCalculationEntities(AssessmentSection assessmentSection, 
-                                                                    AssessmentSectionEntity entity, 
+        private static void AddHydraulicLocationCalculationEntities(AssessmentSection assessmentSection,
+                                                                    AssessmentSectionEntity entity,
                                                                     PersistenceRegistry registry)
         {
             entity.HydraulicLocationCalculationCollectionEntity1 = assessmentSection.WaterLevelCalculationsForSignalingNorm.Create(registry);
@@ -148,7 +148,7 @@
             {
                 entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities.Add(calculationCollection.Create(HydraulicBoundaryLocationCalculationType.WaterLevel, registry));
             }
-            
+
             foreach (HydraulicBoundaryLocationCalculationsForTargetProbability calculationCollection in assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities)
             {
                 entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities.Add(calculationCollection.Create(HydraulicBoundaryLocationCalculationType.Waveheight, registry));
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -r2de644feca4a539d28adb9d6e5ee076c308e4ef6 -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 2de644feca4a539d28adb9d6e5ee076c308e4ef6)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -137,8 +137,8 @@
         }
 
         private static void ReadHydraulicLocationCalculationsForTargetProbabilities(this AssessmentSectionEntity entity,
-                                                                                            IAssessmentSection assessmentSection,
-                                                                                            ReadConversionCollector collector)
+                                                                                    IAssessmentSection assessmentSection,
+                                                                                    ReadConversionCollector collector)
         {
             IEnumerable<HydraulicLocationCalculationForTargetProbabilityCollectionEntity> waveHeightHydraulicLocationCalculationForTargetProbabilityCollectionEntities =
                 entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities.Where(e => e.HydraulicBoundaryLocationCalculationType == (short) HydraulicBoundaryLocationCalculationType.Waveheight);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r85ca18f42309d6e544a05620746ed5e61e42c4fe -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 85ca18f42309d6e544a05620746ed5e61e42c4fe)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -730,7 +730,7 @@
                 sectionResultEntity.Read(result);
             }
         }
-        
+
         private static void ReadGrassCoverErosionOutwardsWaveConditionsRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity,
                                                                                             CalculationGroup targetRootCalculationGroup, ReadConversionCollector collector)
         {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensions.cs
===================================================================
diff -u -rab025c9a24225f2277abf79132e7e5c8d42af931 -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensions.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensions.cs)	(revision ab025c9a24225f2277abf79132e7e5c8d42af931)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensions.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensions.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -56,16 +56,16 @@
             }
 
             var calculations = new HydraulicBoundaryLocationCalculationsForTargetProbability(entity.TargetProbability);
-            IEnumerable<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations = 
+            IEnumerable<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculations =
                 entity.HydraulicLocationCalculationEntities
                       .Select(hlce => CreateHydraulicBoundaryLocationCalculation(hlce, collector))
                       .ToArray();
             calculations.HydraulicBoundaryLocationCalculations.AddRange(hydraulicBoundaryLocationCalculations);
-            
+
             return calculations;
         }
 
-        private static HydraulicBoundaryLocationCalculation CreateHydraulicBoundaryLocationCalculation(HydraulicLocationCalculationEntity calculationEntity, 
+        private static HydraulicBoundaryLocationCalculation CreateHydraulicBoundaryLocationCalculation(HydraulicLocationCalculationEntity calculationEntity,
                                                                                                        ReadConversionCollector collector)
         {
             var calculation = new HydraulicBoundaryLocationCalculation(collector.Get(calculationEntity.HydraulicLocationEntity));
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs
===================================================================
diff -u -r5b3c419193fb9029f3ca6c3dbce8e894aeb7f636 -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision 5b3c419193fb9029f3ca6c3dbce8e894aeb7f636)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -311,7 +311,7 @@
 
             SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities
                                                                            .SelectMany(calc => calc.HydraulicBoundaryLocationCalculations), random.Next());
-            
+
             SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities
                                                                            .SelectMany(calc => calc.HydraulicBoundaryLocationCalculations), random.Next());
         }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision 9a1be3bcbb49a77ba41fdf7681e0d3472ef5921b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -126,12 +126,12 @@
 
             Assert.AreEqual(Convert.ToByte(input.ShouldOvertoppingOutputIllustrationPointsBeCalculated),
                             entity.ShouldOvertoppingOutputIllustrationPointsBeCalculated);
-            
+
             Assert.AreEqual(Convert.ToByte(input.ShouldDikeHeightBeCalculated), entity.ShouldDikeHeightBeCalculated);
             Assert.AreEqual(input.DikeHeightTargetProbability, entity.DikeHeightTargetProbability);
             Assert.AreEqual(Convert.ToByte(input.ShouldDikeHeightIllustrationPointsBeCalculated),
                             entity.ShouldDikeHeightIllustrationPointsBeCalculated);
-            
+
             Assert.AreEqual(Convert.ToByte(input.ShouldOvertoppingRateBeCalculated), entity.ShouldOvertoppingRateBeCalculated);
             Assert.AreEqual(input.OvertoppingRateTargetProbability, entity.OvertoppingRateTargetProbability);
             Assert.AreEqual(Convert.ToByte(input.ShouldOvertoppingRateIllustrationPointsBeCalculated),
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r85ca18f42309d6e544a05620746ed5e61e42c4fe -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 85ca18f42309d6e544a05620746ed5e61e42c4fe)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -20,12 +20,10 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.Calculation;
-using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.Storage.Core.Create;
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs
===================================================================
diff -u -rab025c9a24225f2277abf79132e7e5c8d42af931 -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs)	(revision ab025c9a24225f2277abf79132e7e5c8d42af931)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionCreateExtensionTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -40,10 +40,9 @@
             var random = new Random(21);
             var calculationType = random.NextEnumValue<HydraulicBoundaryLocationCalculationType>();
 
-            
             // Call
             TestDelegate call = () =>
-                ((HydraulicBoundaryLocationCalculationsForTargetProbability) null).Create(calculationType, 
+                ((HydraulicBoundaryLocationCalculationsForTargetProbability) null).Create(calculationType,
                                                                                           new PersistenceRegistry());
 
             // Assert
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r2de644feca4a539d28adb9d6e5ee076c308e4ef6 -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 2de644feca4a539d28adb9d6e5ee076c308e4ef6)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -1049,7 +1049,7 @@
                 i++;
             }
         }
-        
+
         private static void AssertHydraulicLocationCalculationsForTargetProbability(HydraulicLocationCalculationForTargetProbabilityCollectionEntity expectedCalculationCollectionEntity,
                                                                                     HydraulicBoundaryLocation expectedHydraulicBoundaryLocation,
                                                                                     HydraulicBoundaryLocationCalculationsForTargetProbability actualCalculations)
@@ -1094,7 +1094,7 @@
                 entity.HydraulicLocationCalculationForTargetProbabilityCollectionEntities.Add(CreateHydraulicLocationCalculationForTargetProbabilityCollectionEntity(hydraulicLocationEntity, random.Next()));
             }
         }
-        
+
         private static HydraulicLocationCalculationForTargetProbabilityCollectionEntity CreateHydraulicLocationCalculationForTargetProbabilityCollectionEntity(
             HydraulicLocationEntity hydraulicLocationEntity,
             int seed)
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r85ca18f42309d6e544a05620746ed5e61e42c4fe -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 85ca18f42309d6e544a05620746ed5e61e42c4fe)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -30,7 +30,6 @@
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
-using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.Structures;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.DuneErosion.Data;
@@ -49,7 +48,6 @@
 using Riskeer.Storage.Core.Read;
 using Riskeer.Storage.Core.Serializers;
 using Riskeer.Storage.Core.TestUtil;
-using Riskeer.Storage.Core.TestUtil.Hydraulics;
 using Riskeer.Storage.Core.TestUtil.MacroStabilityInwards;
 using Riskeer.WaveImpactAsphaltCover.Data;
 
@@ -1460,7 +1458,7 @@
             Assert.AreEqual(fileLocation, foreshoreProfiles.SourcePath);
             CollectionAssert.IsEmpty(foreshoreProfiles);
         }
-        
+
         [Test]
         public void ReadAsGrassCoverErosionOutwardsFailureMechanism_WithForeshoreProfilesAndSourcePath_ReturnsFailureMechanismWithForeshoreProfilesAndSourcePathSet()
         {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rae63828db6c6e20bc476fe8adfef362e3966a5ad -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs)	(revision ae63828db6c6e20bc476fe8adfef362e3966a5ad)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -105,7 +105,7 @@
             Assert.AreEqual(entity.BreakWaterHeight, input.BreakWater.Height.Value);
             AssertBoolean(entity.ShouldOvertoppingOutputIllustrationPointsBeCalculated,
                           input.ShouldOvertoppingOutputIllustrationPointsBeCalculated);
-            
+
             AssertBoolean(entity.ShouldDikeHeightBeCalculated, input.ShouldDikeHeightBeCalculated);
             Assert.AreEqual(entity.DikeHeightTargetProbability, input.DikeHeightTargetProbability);
             AssertBoolean(entity.ShouldDikeHeightIllustrationPointsBeCalculated,
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs
===================================================================
diff -u -rab025c9a24225f2277abf79132e7e5c8d42af931 -r40a2cea12afc97ec54bb32ebe7d68f04d22c398f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs)	(revision ab025c9a24225f2277abf79132e7e5c8d42af931)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs	(.../HydraulicLocationCalculationForTargetProbabilityCollectionEntityReadExtensionsTest.cs)	(revision 40a2cea12afc97ec54bb32ebe7d68f04d22c398f)
@@ -46,7 +46,7 @@
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("entity", exception.ParamName);
         }
-        
+
         [Test]
         public void Read_CollectorNull_ThrowsArgumentNullException()
         {