Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r512d35716e4a14f14d35258a436f560230c64b14
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs	(.../GrassCoverErosionOutwardsCalculationActivityFactory.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs	(.../GrassCoverErosionOutwardsCalculationActivityFactory.cs)	(revision 512d35716e4a14f14d35258a436f560230c64b14)
@@ -24,7 +24,6 @@
 using System.Linq;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
-using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Service;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources;
@@ -59,45 +58,10 @@
                 throw new ArgumentNullException(nameof(assessmentSection));
             }
 
-            var activities = new List<CalculatableActivity>();
-            activities.AddRange(CreateDesignWaterLevelCalculationActivities(failureMechanism, assessmentSection));
-            activities.AddRange(CreateWaveHeightCalculationActivities(failureMechanism, assessmentSection));
-            activities.AddRange(CreateWaveConditionsCalculationActivities(failureMechanism.WaveConditionsCalculationGroup, failureMechanism, assessmentSection));
-            return activities;
+            return CreateWaveConditionsCalculationActivities(failureMechanism.WaveConditionsCalculationGroup, failureMechanism, assessmentSection);
         }
 
         /// <summary>
-        /// Creates a collection of <see cref="CalculatableActivity"/> based on the calculations in
-        /// <paramref name="failureMechanism"/> without hydraulic boundary calculations on assessment section level.
-        /// </summary>
-        /// <param name="failureMechanism">The failure mechanism to create the activities for.</param>
-        /// <param name="assessmentSection">The assessment section the failure mechanism belongs to.</param>
-        /// <returns>A collection of <see cref="CalculatableActivity"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static IEnumerable<CalculatableActivity> CreateCalculationActivitiesWithoutAssessmentSectionCalculations(
-            GrassCoverErosionOutwardsFailureMechanism failureMechanism,
-            IAssessmentSection assessmentSection)
-        {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-
-            if (assessmentSection == null)
-            {
-                throw new ArgumentNullException(nameof(assessmentSection));
-            }
-
-            var activities = new List<CalculatableActivity>();
-            activities.AddRange(CreateDesignWaterLevelCalculationActivities(failureMechanism, assessmentSection, false));
-            activities.AddRange(CreateWaveHeightCalculationActivities(failureMechanism, assessmentSection, false));
-            activities.AddRange(CreateWaveConditionsCalculationActivities(failureMechanism.WaveConditionsCalculationGroup, failureMechanism, assessmentSection));
-            return activities;
-        }
-
-        #region Wave Conditions
-
-        /// <summary>
         /// Creates a collection of <see cref="CalculatableActivity"/> based on the wave conditions calculations in
         /// <paramref name="calculationGroup"/>.
         /// </summary>
@@ -164,147 +128,5 @@
                                                                                   failureMechanism,
                                                                                   assessmentSection);
         }
-
-        #endregion
-
-        #region Hydraulic Boundary Location Calculations
-
-        /// <summary>
-        /// Creates a collection of <see cref="CalculatableActivity"/> based on the wave height calculations in
-        /// <paramref name="failureMechanism"/>.
-        /// </summary>
-        /// <param name="failureMechanism">The failure mechanism to create the activities for.</param>
-        /// <param name="assessmentSection">The assessment section the failure mechanism belongs to.</param>
-        /// <returns>A collection of <see cref="CalculatableActivity"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static IEnumerable<CalculatableActivity> CreateWaveHeightCalculationActivities(
-            GrassCoverErosionOutwardsFailureMechanism failureMechanism,
-            IAssessmentSection assessmentSection)
-        {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-
-            if (assessmentSection == null)
-            {
-                throw new ArgumentNullException(nameof(assessmentSection));
-            }
-
-            return CreateWaveHeightCalculationActivities(failureMechanism, assessmentSection, true);
-        }
-
-        /// <summary>
-        /// Creates a collection of <see cref="CalculatableActivity"/> based on the design water level calculations in
-        /// <paramref name="failureMechanism"/>.
-        /// </summary>
-        /// <param name="failureMechanism">The failure mechanism to create the activities for.</param>
-        /// <param name="assessmentSection">The assessment section the failure mechanism belongs to.</param>
-        /// <returns>A collection of <see cref="CalculatableActivity"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static IEnumerable<CalculatableActivity> CreateDesignWaterLevelCalculationActivities(
-            GrassCoverErosionOutwardsFailureMechanism failureMechanism,
-            IAssessmentSection assessmentSection)
-        {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-
-            if (assessmentSection == null)
-            {
-                throw new ArgumentNullException(nameof(assessmentSection));
-            }
-
-            return CreateDesignWaterLevelCalculationActivities(failureMechanism, assessmentSection, true);
-        }
-
-        private static IEnumerable<CalculatableActivity> CreateWaveHeightCalculationActivities(
-            GrassCoverErosionOutwardsFailureMechanism failureMechanism,
-            IAssessmentSection assessmentSection,
-            bool includeAssessmentSectionCalculations)
-        {
-            var activities = new List<CalculatableActivity>();
-
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm,
-                                    assessmentSection,
-                                    failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName));
-
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm,
-                                    assessmentSection,
-                                    failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName));
-
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm,
-                                    assessmentSection,
-                                    failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName));
-
-            if (includeAssessmentSectionCalculations)
-            {
-                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                        assessmentSection.WaveHeightCalculationsForLowerLimitNorm,
-                                        assessmentSection,
-                                        failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                                        RiskeerCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName));
-
-                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                        assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
-                                        assessmentSection,
-                                        failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                                        RiskeerCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName));
-            }
-
-            return activities;
-        }
-
-        private static IEnumerable<CalculatableActivity> CreateDesignWaterLevelCalculationActivities(
-            GrassCoverErosionOutwardsFailureMechanism failureMechanism,
-            IAssessmentSection assessmentSection,
-            bool includeAssessmentSectionCalculations)
-        {
-            var activities = new List<CalculatableActivity>();
-
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm,
-                                    assessmentSection,
-                                    failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName));
-
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm,
-                                    assessmentSection,
-                                    failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName));
-
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm,
-                                    assessmentSection,
-                                    failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName));
-
-            if (includeAssessmentSectionCalculations)
-            {
-                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                        assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
-                                        assessmentSection,
-                                        failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                                        RiskeerCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName));
-
-                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                        assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
-                                        assessmentSection,
-                                        failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                                        RiskeerCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName));
-            }
-
-            return activities;
-        }
-
-        #endregion
     }
 }
\ No newline at end of file