Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r656b7946c1c0f7585fcb139341480e3bbcb95fb5 -r29745d610b572f89d18948dd0f00fc02fffe4985
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 656b7946c1c0f7585fcb139341480e3bbcb95fb5)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 29745d610b572f89d18948dd0f00fc02fffe4985)
@@ -308,30 +308,6 @@
             {
                 CreateInstance = context => new FailureMechanismSectionAssemblyCategoriesProperties(context.GetFailureMechanismSectionAssemblyCategoriesFunc())
             };
-            yield return new PropertyInfo<DesignWaterLevelCalculationsGroupContext, DesignWaterLevelCalculationsGroupProperties>
-            {
-                CreateInstance = context =>
-                {
-                    IEnumerable<Tuple<string, IEnumerable<HydraulicBoundaryLocationCalculation>>> calculationsPerCategoryBoundary =
-                        DesignWaterLevelCalculationsGroupContextChildNodeObjects(context)
-                            .Cast<DesignWaterLevelCalculationsContext>()
-                            .Select(childContext => new Tuple<string, IEnumerable<HydraulicBoundaryLocationCalculation>>(childContext.CategoryBoundaryName,
-                                                                                                                         childContext.WrappedData));
-                    return new DesignWaterLevelCalculationsGroupProperties(context.WrappedData, calculationsPerCategoryBoundary);
-                }
-            };
-            yield return new PropertyInfo<WaveHeightCalculationsGroupContext, WaveHeightCalculationsGroupProperties>
-            {
-                CreateInstance = context =>
-                {
-                    IEnumerable<Tuple<string, IEnumerable<HydraulicBoundaryLocationCalculation>>> calculationsPerCategoryBoundary =
-                        WaveHeightCalculationsGroupContextChildNodeObjects(context)
-                            .Cast<WaveHeightCalculationsContext>()
-                            .Select(childContext => new Tuple<string, IEnumerable<HydraulicBoundaryLocationCalculation>>(childContext.CategoryBoundaryName,
-                                                                                                                         childContext.WrappedData));
-                    return new WaveHeightCalculationsGroupProperties(context.WrappedData, calculationsPerCategoryBoundary);
-                }
-            };
             yield return new PropertyInfo<AssemblyResultCategoriesContext, AssemblyResultCategoriesProperties>
             {
                 CreateInstance = context => new AssemblyResultCategoriesProperties(context.GetAssemblyCategoriesFunc(), context.WrappedData)
@@ -2510,52 +2486,6 @@
             parent.NotifyObservers();
         }
 
-        private static object[] DesignWaterLevelCalculationsGroupContextChildNodeObjects(DesignWaterLevelCalculationsGroupContext context)
-        {
-            return new object[]
-            {
-                new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm,
-                                                        context.AssessmentSection,
-                                                        () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm),
-                                                        RiskeerCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName),
-                new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForSignalingNorm,
-                                                        context.AssessmentSection,
-                                                        () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm),
-                                                        RiskeerCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName),
-                new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm,
-                                                        context.AssessmentSection,
-                                                        () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm),
-                                                        RiskeerCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName),
-                new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
-                                                        context.AssessmentSection,
-                                                        () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedLowerLimitNorm),
-                                                        RiskeerCommonDataResources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName)
-            };
-        }
-
-        private static object[] WaveHeightCalculationsGroupContextChildNodeObjects(WaveHeightCalculationsGroupContext context)
-        {
-            return new object[]
-            {
-                new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm,
-                                                  context.AssessmentSection,
-                                                  () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm),
-                                                  RiskeerCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName),
-                new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForSignalingNorm,
-                                                  context.AssessmentSection,
-                                                  () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm),
-                                                  RiskeerCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName),
-                new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForLowerLimitNorm,
-                                                  context.AssessmentSection,
-                                                  () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm),
-                                                  RiskeerCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName),
-                new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
-                                                  context.AssessmentSection,
-                                                  () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedLowerLimitNorm),
-                                                  RiskeerCommonDataResources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName)
-            };
-        }
-
         private static bool HasIllustrationPoints(IAssessmentSection assessmentSection)
         {
             return WaterLevelCalculationsForNormTargetProbabilitiesHaveIllustrationPoints(assessmentSection)
Fisheye: Tag 29745d610b572f89d18948dd0f00fc02fffe4985 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsGroupContextPropertyInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 29745d610b572f89d18948dd0f00fc02fffe4985 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsGroupContextPropertyInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r656b7946c1c0f7585fcb139341480e3bbcb95fb5 -r29745d610b572f89d18948dd0f00fc02fffe4985
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 656b7946c1c0f7585fcb139341480e3bbcb95fb5)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 29745d610b572f89d18948dd0f00fc02fffe4985)
@@ -232,7 +232,7 @@
                 PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(27, propertyInfos.Length);
+                Assert.AreEqual(25, propertyInfos.Length);
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
@@ -356,16 +356,6 @@
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
-                    typeof(DesignWaterLevelCalculationsGroupContext),
-                    typeof(DesignWaterLevelCalculationsGroupProperties));
-
-                PluginTestHelper.AssertPropertyInfoDefined(
-                    propertyInfos,
-                    typeof(WaveHeightCalculationsGroupContext),
-                    typeof(WaveHeightCalculationsGroupProperties));
-
-                PluginTestHelper.AssertPropertyInfoDefined(
-                    propertyInfos,
                     typeof(AssemblyResultCategoriesContext),
                     typeof(AssemblyResultCategoriesProperties));
             }