Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r69e52fada8dd520bce8d07411cda2eb8ec3d2268 -rd622d7d3207be2390bb6e0b266f1f7712a2fe779
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 69e52fada8dd520bce8d07411cda2eb8ec3d2268)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision d622d7d3207be2390bb6e0b266f1f7712a2fe779)
@@ -35,7 +35,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.Contribution;
-using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms;
 using Riskeer.Common.Forms.ChangeHandlers;
@@ -44,7 +43,6 @@
 using Riskeer.Common.Forms.Helpers;
 using Riskeer.Common.Forms.ImportInfos;
 using Riskeer.Common.Forms.PresentationObjects;
-using Riskeer.Common.Forms.PropertyClasses;
 using Riskeer.Common.Forms.TreeNodeInfos;
 using Riskeer.Common.Forms.UpdateInfos;
 using Riskeer.Common.Forms.Views;
@@ -83,20 +81,13 @@
                     context.WrappedData,
                     new GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler())
             };
+
             yield return new PropertyInfo<GrassCoverErosionOutwardsFailurePathContext, GrassCoverErosionOutwardsFailurePathProperties>
             {
                 CreateInstance = context => new GrassCoverErosionOutwardsFailurePathProperties(
                     context.WrappedData,
                     new GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler())
             };
-            yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext, DesignWaterLevelCalculationsProperties>
-            {
-                CreateInstance = context => new DesignWaterLevelCalculationsProperties(context.WrappedData)
-            };
-            yield return new PropertyInfo<GrassCoverErosionOutwardsWaveHeightCalculationsContext, WaveHeightCalculationsProperties>
-            {
-                CreateInstance = context => new WaveHeightCalculationsProperties(context.WrappedData)
-            };
 
             yield return new PropertyInfo<GrassCoverErosionOutwardsWaveConditionsOutputContext, GrassCoverErosionOutwardsWaveConditionsOutputProperties>
             {
@@ -112,32 +103,6 @@
                                                                       context.Calculation.InputParameters.CategoryType),
                     new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData))
             };
-
-            yield return new PropertyInfo<GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext, DesignWaterLevelCalculationsGroupProperties>
-            {
-                CreateInstance = context =>
-                {
-                    IEnumerable<Tuple<string, IEnumerable<HydraulicBoundaryLocationCalculation>>> calculationsPerCategoryBoundary =
-                        DesignWaterLevelCalculationsGroupContextChildNodeObjects(context)
-                            .Cast<GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext>()
-                            .Select(childContext => new Tuple<string, IEnumerable<HydraulicBoundaryLocationCalculation>>(childContext.CategoryBoundaryName,
-                                                                                                                         childContext.WrappedData));
-                    return new DesignWaterLevelCalculationsGroupProperties(context.WrappedData, calculationsPerCategoryBoundary);
-                }
-            };
-
-            yield return new PropertyInfo<GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext, WaveHeightCalculationsGroupProperties>
-            {
-                CreateInstance = context =>
-                {
-                    IEnumerable<Tuple<string, IEnumerable<HydraulicBoundaryLocationCalculation>>> calculationsPerCategoryBoundary =
-                        WaveHeightCalculationsGroupContextChildNodeObjects(context)
-                            .Cast<GrassCoverErosionOutwardsWaveHeightCalculationsContext>()
-                            .Select(childContext => new Tuple<string, IEnumerable<HydraulicBoundaryLocationCalculation>>(childContext.CategoryBoundaryName,
-                                                                                                                         childContext.WrappedData));
-                    return new WaveHeightCalculationsGroupProperties(context.WrappedData, calculationsPerCategoryBoundary);
-                }
-            };
         }
 
         public override IEnumerable<ImportInfo> GetImportInfos()
@@ -920,88 +885,6 @@
 
         #endregion
 
-        #region GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext TreeNodeInfo
-
-        private static object[] DesignWaterLevelCalculationsGroupContextChildNodeObjects(GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext context)
-        {
-            return new object[]
-            {
-                new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
-                    context.FailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName),
-                new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
-                    context.FailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName),
-                new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
-                    context.FailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName),
-                new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
-                    context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName),
-                new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
-                    context.AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName)
-            };
-        }
-
-        #endregion
-
-        #region GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext TreeNodeInfo
-
-        private static object[] WaveHeightCalculationsGroupContextChildNodeObjects(GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext context)
-        {
-            return new object[]
-            {
-                new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
-                    context.FailureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName),
-                new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
-                    context.FailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName),
-                new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
-                    context.FailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName),
-                new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
-                    context.AssessmentSection.WaveHeightCalculationsForLowerLimitNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName),
-                new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
-                    context.AssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
-                    context.FailureMechanism,
-                    context.AssessmentSection,
-                    () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                    RiskeerCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName)
-            };
-        }
-
-        #endregion
-
         private static void SetHydraulicsMenuItemEnabledStateAndTooltip(IAssessmentSection assessmentSection,
                                                                         StrictContextMenuItem menuItem)
         {
Fisheye: Tag d622d7d3207be2390bb6e0b266f1f7712a2fe779 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextPropertyInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d622d7d3207be2390bb6e0b266f1f7712a2fe779 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextPropertyInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d622d7d3207be2390bb6e0b266f1f7712a2fe779 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextPropertyInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d622d7d3207be2390bb6e0b266f1f7712a2fe779 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextPropertyInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?