Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -36,7 +36,7 @@
     internal static class GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions
     {
         /// <summary>
-        /// Creates a <see cref="GrassCoverErosionOutwardsWaveConditionsCalculationEntity"/> based on the information of the 
+        /// Creates a <see cref="GrassCoverErosionOutwardsWaveConditionsCalculationEntity"/> based on the information of the
         /// <see cref="GrassCoverErosionOutwardsWaveConditionsCalculation"/>.
         /// </summary>
         /// <param name="calculation">The calculation to create a database entity for.</param>
@@ -101,7 +101,6 @@
             entity.UpperBoundaryWaterLevels = calculationInput.UpperBoundaryWaterLevels.ToNaNAsNull();
             entity.LowerBoundaryWaterLevels = calculationInput.LowerBoundaryWaterLevels.ToNaNAsNull();
             entity.StepSize = Convert.ToByte(calculationInput.StepSize);
-            entity.CategoryType = Convert.ToByte(calculationInput.CategoryType);
             entity.CalculationType = Convert.ToByte(calculationInput.CalculationType);
             entity.WaterLevelType = Convert.ToByte(calculationInput.WaterLevelType);
         }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs	(.../StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs	(.../StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -34,7 +34,7 @@
     internal static class StabilityStoneCoverWaveConditionsCalculationCreateExtensions
     {
         /// <summary>
-        /// Creates a <see cref="StabilityStoneCoverWaveConditionsCalculationEntity"/> based on the information of the 
+        /// Creates a <see cref="StabilityStoneCoverWaveConditionsCalculationEntity"/> based on the information of the
         /// <see cref="StabilityStoneCoverWaveConditionsCalculation"/>.
         /// </summary>
         /// <param name="calculation">The calculation to create a database entity for.</param>
@@ -98,7 +98,6 @@
             entity.UpperBoundaryWaterLevels = calculationInput.UpperBoundaryWaterLevels.ToNaNAsNull();
             entity.LowerBoundaryWaterLevels = calculationInput.LowerBoundaryWaterLevels.ToNaNAsNull();
             entity.StepSize = Convert.ToByte(calculationInput.StepSize);
-            entity.CategoryType = Convert.ToByte(calculationInput.CategoryType);
             entity.CalculationType = Convert.ToByte(calculationInput.CalculationType);
             entity.WaterLevelType = Convert.ToByte(calculationInput.WaterLevelType);
         }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -35,7 +35,7 @@
     internal static class WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions
     {
         /// <summary>
-        /// Creates a <see cref="WaveImpactAsphaltCoverWaveConditionsCalculationEntity"/> based on the information of the 
+        /// Creates a <see cref="WaveImpactAsphaltCoverWaveConditionsCalculationEntity"/> based on the information of the
         /// <see cref="WaveImpactAsphaltCoverWaveConditionsCalculation"/>.
         /// </summary>
         /// <param name="calculation">The calculation to create a database entity for.</param>
@@ -100,7 +100,6 @@
             entity.UpperBoundaryWaterLevels = calculationInput.UpperBoundaryWaterLevels.ToNaNAsNull();
             entity.LowerBoundaryWaterLevels = calculationInput.LowerBoundaryWaterLevels.ToNaNAsNull();
             entity.StepSize = Convert.ToByte(calculationInput.StepSize);
-            entity.CategoryType = Convert.ToByte(calculationInput.CategoryType);
             entity.WaterLevelType = Convert.ToByte(calculationInput.WaterLevelType);
         }
 
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -24,7 +24,6 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using Riskeer.Common.Data.DikeProfiles;
-using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.Revetment.Data;
@@ -97,7 +96,6 @@
             inputParameters.UpperBoundaryWaterLevels = (RoundedDouble) entity.UpperBoundaryWaterLevels.ToNullAsNaN();
             inputParameters.LowerBoundaryWaterLevels = (RoundedDouble) entity.LowerBoundaryWaterLevels.ToNullAsNaN();
             inputParameters.StepSize = (WaveConditionsInputStepSize) entity.StepSize;
-            inputParameters.CategoryType = (FailureMechanismCategoryType) entity.CategoryType;
             inputParameters.CalculationType = (GrassCoverErosionOutwardsWaveConditionsCalculationType) entity.CalculationType;
             inputParameters.WaterLevelType = (WaveConditionsInputWaterLevelType) entity.WaterLevelType;
         }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs	(.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs	(.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Data;
-using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Revetment.Data;
@@ -96,7 +95,6 @@
             inputParameters.UpperBoundaryWaterLevels = (RoundedDouble) entity.UpperBoundaryWaterLevels.ToNullAsNaN();
             inputParameters.LowerBoundaryWaterLevels = (RoundedDouble) entity.LowerBoundaryWaterLevels.ToNullAsNaN();
             inputParameters.StepSize = (WaveConditionsInputStepSize) entity.StepSize;
-            inputParameters.CategoryType = (AssessmentSectionCategoryType) entity.CategoryType;
             inputParameters.CalculationType = (StabilityStoneCoverWaveConditionsCalculationType) entity.CalculationType;
             inputParameters.WaterLevelType = (WaveConditionsInputWaterLevelType) entity.WaterLevelType;
         }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -22,7 +22,6 @@
 using System;
 using System.Linq;
 using Core.Common.Base.Data;
-using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Revetment.Data;
@@ -96,7 +95,6 @@
             inputParameters.UpperBoundaryWaterLevels = (RoundedDouble) entity.UpperBoundaryWaterLevels.ToNullAsNaN();
             inputParameters.LowerBoundaryWaterLevels = (RoundedDouble) entity.LowerBoundaryWaterLevels.ToNullAsNaN();
             inputParameters.StepSize = (WaveConditionsInputStepSize) entity.StepSize;
-            inputParameters.CategoryType = (AssessmentSectionCategoryType) entity.CategoryType;
             inputParameters.WaterLevelType = (WaveConditionsInputWaterLevelType) entity.WaterLevelType;
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -105,7 +105,6 @@
             Assert.AreEqual(input.UpperBoundaryWaterLevels, entity.UpperBoundaryWaterLevels, input.UpperBoundaryWaterLevels.GetAccuracy());
             Assert.AreEqual(input.LowerBoundaryWaterLevels, entity.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy());
             Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize);
-            Assert.AreEqual(Convert.ToByte(input.CategoryType), entity.CategoryType);
             Assert.AreEqual(Convert.ToByte(input.CalculationType), entity.CalculationType);
             Assert.AreEqual(Convert.ToByte(input.WaterLevelType), entity.WaterLevelType);
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -104,7 +104,6 @@
             Assert.AreEqual(input.UpperBoundaryWaterLevels, entity.UpperBoundaryWaterLevels, input.UpperBoundaryWaterLevels.GetAccuracy());
             Assert.AreEqual(input.LowerBoundaryWaterLevels, entity.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy());
             Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize);
-            Assert.AreEqual(Convert.ToByte(input.CategoryType), entity.CategoryType);
             Assert.AreEqual(Convert.ToByte(input.CalculationType), entity.CalculationType);
             Assert.AreEqual(Convert.ToByte(input.WaterLevelType), entity.WaterLevelType);
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -104,7 +104,6 @@
             Assert.AreEqual(input.UpperBoundaryWaterLevels, entity.UpperBoundaryWaterLevels, input.UpperBoundaryWaterLevels.GetAccuracy());
             Assert.AreEqual(input.LowerBoundaryWaterLevels, entity.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy());
             Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize);
-            Assert.AreEqual(Convert.ToByte(input.CategoryType), entity.CategoryType);
             Assert.AreEqual(Convert.ToByte(input.WaterLevelType), entity.WaterLevelType);
 
             Assert.AreEqual(order, entity.Order);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -103,7 +103,6 @@
                 UpperBoundaryWaterLevels = upperBoundaryWaterLevels,
                 LowerBoundaryWaterLevels = lowerBoundaryWaterLevels,
                 StepSize = Convert.ToByte(stepSize),
-                CategoryType = Convert.ToByte(categoryType),
                 CalculationType = Convert.ToByte(calculationType),
                 WaterLevelType = Convert.ToByte(waterLevelType)
             };
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -103,7 +103,6 @@
                 UpperBoundaryWaterLevels = upperBoundaryWaterLevels,
                 LowerBoundaryWaterLevels = lowerBoundaryWaterLevels,
                 StepSize = Convert.ToByte(stepSize),
-                CategoryType = Convert.ToByte(categoryType),
                 CalculationType = Convert.ToByte(calculationType),
                 WaterLevelType = Convert.ToByte(waterLevelType)
             };
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rb55bd2473fa99837b45a0a198c5ced30afee500d -re47ac86398c5a5814dd1fa8760c9d1cc0537c531
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision b55bd2473fa99837b45a0a198c5ced30afee500d)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs)	(revision e47ac86398c5a5814dd1fa8760c9d1cc0537c531)
@@ -102,7 +102,6 @@
                 UpperBoundaryWaterLevels = upperBoundaryWaterLevels,
                 LowerBoundaryWaterLevels = lowerBoundaryWaterLevels,
                 StepSize = Convert.ToByte(stepSize),
-                CategoryType = Convert.ToByte(categoryType),
                 WaterLevelType = Convert.ToByte(waterLevelType)
             };