Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs
===================================================================
diff -u -r6811f4155d92f0a1318764695159893c2b7db99f -r7b7731a59cf0e7174ed0de97dac62c4252549580
--- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs	(.../AssessmentSectionExtensions.cs)	(revision 6811f4155d92f0a1318764695159893c2b7db99f)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs	(.../AssessmentSectionExtensions.cs)	(revision 7b7731a59cf0e7174ed0de97dac62c4252549580)
@@ -97,37 +97,6 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="HydraulicBoundaryLocationCalculation"/> for a <see cref="HydraulicBoundaryLocation"/>
-        /// based on <see cref="AssessmentSectionCategoryType"/>.</summary>
-        /// <param name="assessmentSection">The assessment section to get the <see cref="HydraulicBoundaryLocationCalculation"/> from.</param>
-        /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to get the <see cref="HydraulicBoundaryLocationCalculation"/> for.</param>
-        /// <param name="categoryType">The category type to use while obtaining the <see cref="HydraulicBoundaryLocationCalculation"/>.</param>
-        /// <returns>The <see cref="HydraulicBoundaryLocationCalculation"/>, or <c>null</c> when:
-        /// <list type="bullet">
-        /// <item><paramref name="hydraulicBoundaryLocation"/> is <c>null</c>;</item>
-        /// <item><paramref name="hydraulicBoundaryLocation"/> is not part of <paramref name="assessmentSection"/>.</item>
-        /// </list>
-        /// </returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="assessmentSection"/>
-        /// is <c>null</c>.</exception>
-        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="categoryType"/>
-        /// is an invalid <see cref="AssessmentSectionCategoryType"/>.</exception>
-        /// <exception cref="NotSupportedException">Thrown when <paramref name="categoryType"/>
-        /// is a valid but unsupported <see cref="AssessmentSectionCategoryType"/>.</exception>
-        public static HydraulicBoundaryLocationCalculation GetHydraulicBoundaryLocationCalculation(this IAssessmentSection assessmentSection,
-                                                                                                   HydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                                                                                   AssessmentSectionCategoryType categoryType)
-        {
-            if (assessmentSection == null)
-            {
-                throw new ArgumentNullException(nameof(assessmentSection));
-            }
-
-            return GetHydraulicBoundaryLocationCalculationFromCalculations(hydraulicBoundaryLocation,
-                                                                           GetHydraulicBoundaryLocationCalculations(assessmentSection, categoryType));
-        }
-
-        /// <summary>
         /// Gets the relevant collection of <see cref="HydraulicBoundaryLocationCalculation"/> based on the <see cref="NormType"/> of the
         /// assessment section.
         /// </summary>
@@ -167,50 +136,6 @@
             return calculations;
         }
 
-        /// <summary>
-        /// Gets the collection of <see cref="HydraulicBoundaryLocationCalculation"/> that belongs to
-        /// the given <paramref name="categoryType"/>.
-        /// </summary>
-        /// <param name="assessmentSection">The assessment section to get the calculations from.</param>
-        /// <param name="categoryType">The <see cref="AssessmentSectionCategoryType"/> used to determine which calculations to return.</param>
-        /// <returns>A collection of <see cref="HydraulicBoundaryLocationCalculation"/>.</returns>
-        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="categoryType"/>
-        /// is an invalid <see cref="AssessmentSectionCategoryType"/>.</exception>
-        /// <exception cref="NotSupportedException">Thrown when <paramref name="categoryType"/>
-        /// is a valid but unsupported <see cref="AssessmentSectionCategoryType"/>.</exception>
-        private static IEnumerable<HydraulicBoundaryLocationCalculation> GetHydraulicBoundaryLocationCalculations(IAssessmentSection assessmentSection,
-                                                                                                                  AssessmentSectionCategoryType categoryType)
-        {
-            if (!Enum.IsDefined(typeof(AssessmentSectionCategoryType), categoryType))
-            {
-                throw new InvalidEnumArgumentException(nameof(categoryType),
-                                                       (int) categoryType,
-                                                       typeof(AssessmentSectionCategoryType));
-            }
-
-            IEnumerable<HydraulicBoundaryLocationCalculation> calculations;
-
-            switch (categoryType)
-            {
-                case AssessmentSectionCategoryType.FactorizedSignalingNorm:
-                    calculations = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm;
-                    break;
-                case AssessmentSectionCategoryType.SignalingNorm:
-                    calculations = assessmentSection.WaterLevelCalculationsForSignalingNorm;
-                    break;
-                case AssessmentSectionCategoryType.LowerLimitNorm:
-                    calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm;
-                    break;
-                case AssessmentSectionCategoryType.FactorizedLowerLimitNorm:
-                    calculations = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm;
-                    break;
-                default:
-                    throw new NotSupportedException();
-            }
-
-            return calculations;
-        }
-
         private static HydraulicBoundaryLocationCalculation GetHydraulicBoundaryLocationCalculationFromCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation,
                                                                                                                     IEnumerable<HydraulicBoundaryLocationCalculation> calculations)
         {
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs
===================================================================
diff -u -r6811f4155d92f0a1318764695159893c2b7db99f -r7b7731a59cf0e7174ed0de97dac62c4252549580
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs	(.../AssessmentSectionExtensionsTest.cs)	(revision 6811f4155d92f0a1318764695159893c2b7db99f)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs	(.../AssessmentSectionExtensionsTest.cs)	(revision 7b7731a59cf0e7174ed0de97dac62c4252549580)
@@ -148,84 +148,6 @@
         }
 
         [Test]
-        public void GetHydraulicBoundaryLocationCalculation_AssessmentSectionNull_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => AssessmentSectionExtensions.GetHydraulicBoundaryLocationCalculation(null, new TestHydraulicBoundaryLocation(),
-                                                                                               AssessmentSectionCategoryType.FactorizedLowerLimitNorm);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("assessmentSection", paramName);
-        }
-
-        [Test]
-        public void GetHydraulicBoundaryLocationCalculation_InvalidAssessmentSectionCategoryType_ThrowsInvalidEnumArgumentException()
-        {
-            // Setup
-            const int invalidValue = 9999;
-
-            var assessmentSection = new AssessmentSectionStub();
-
-            // Call
-            void Call() => assessmentSection.GetHydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(),
-                                                                                     (AssessmentSectionCategoryType) invalidValue);
-
-            // Assert
-            var expectedMessage = $"The value of argument 'categoryType' ({invalidValue}) is invalid for Enum type '{nameof(AssessmentSectionCategoryType)}'.";
-            string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, expectedMessage).ParamName;
-            Assert.AreEqual("categoryType", parameterName);
-        }
-
-        [Test]
-        public void GetHydraulicBoundaryLocationCalculation_HydraulicBoundaryLocationNull_ReturnsNull()
-        {
-            // Setup
-            var assessmentSection = new AssessmentSectionStub();
-
-            // Call
-            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.GetHydraulicBoundaryLocationCalculation(
-                null,
-                new Random(32).NextEnumValue<AssessmentSectionCategoryType>());
-
-            // Assert
-            Assert.IsNull(hydraulicBoundaryLocationCalculation);
-        }
-
-        [Test]
-        public void GetHydraulicBoundaryLocationCalculation_NoCorrespondingCalculation_ReturnsNull()
-        {
-            // Setup
-            var assessmentSection = new AssessmentSectionStub();
-
-            // Call
-            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.GetHydraulicBoundaryLocationCalculation(
-                new TestHydraulicBoundaryLocation(),
-                new Random(32).NextEnumValue<AssessmentSectionCategoryType>());
-
-            // Assert
-            Assert.IsNull(hydraulicBoundaryLocationCalculation);
-        }
-
-        [Test]
-        [TestCaseSource(
-            typeof(AssessmentSectionTestHelper),
-            nameof(AssessmentSectionTestHelper.GetHydraulicBoundaryLocationCalculationConfigurationPerAssessmentSectionCategoryType))]
-        public void GetHydraulicBoundaryLocationCalculation_HydraulicBoundaryLocationWithOutput_ReturnsCorrespondingHydraulicBoundaryLocationCalculation(
-            IAssessmentSection assessmentSection,
-            HydraulicBoundaryLocation hydraulicBoundaryLocation,
-            AssessmentSectionCategoryType categoryType,
-            HydraulicBoundaryLocationCalculation expectedHydraulicBoundaryLocationCalculation)
-        {
-            // Call
-            HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.GetHydraulicBoundaryLocationCalculation(
-                hydraulicBoundaryLocation, categoryType);
-
-            // Assert
-            Assert.AreSame(expectedHydraulicBoundaryLocationCalculation, hydraulicBoundaryLocationCalculation);
-        }
-
-        [Test]
         public void GetNormativeHydraulicBoundaryLocationCalculation_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call