Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r812870236917a63b3c908298a80135bc52c4c214 -r69e52fada8dd520bce8d07411cda2eb8ec3d2268
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 812870236917a63b3c908298a80135bc52c4c214)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 69e52fada8dd520bce8d07411cda2eb8ec3d2268)
@@ -50,7 +50,6 @@
 using Riskeer.Common.Forms.Views;
 using Riskeer.Common.Plugin;
 using Riskeer.Common.Service;
-using Riskeer.Common.Util;
 using Riskeer.GrassCoverErosionOutwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Forms;
 using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects;
@@ -275,20 +274,6 @@
                 ContextMenuStrip = GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextMenuStrip
             };
 
-            yield return new TreeNodeInfo<GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext>
-            {
-                Text = context => RiskeerPluginHelper.FormatCategoryBoundaryName(context.CategoryBoundaryName),
-                Image = context => RiskeerCommonFormsResources.GenericInputOutputIcon,
-                ContextMenuStrip = GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextMenuStrip
-            };
-
-            yield return new TreeNodeInfo<GrassCoverErosionOutwardsWaveHeightCalculationsContext>
-            {
-                Text = context => RiskeerPluginHelper.FormatCategoryBoundaryName(context.CategoryBoundaryName),
-                Image = context => RiskeerCommonFormsResources.GenericInputOutputIcon,
-                ContextMenuStrip = GrassCoverErosionOutwardsWaveHeightCalculationsContextMenuStrip
-            };
-
             yield return new TreeNodeInfo<EmptyGrassCoverErosionOutwardsOutput>
             {
                 Text = emptyOutput => RiskeerCommonFormsResources.CalculationOutput_DisplayName,
@@ -584,102 +569,6 @@
 
         #endregion
 
-        #region GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext TreeNodeInfo
-
-        private ContextMenuStrip GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextMenuStrip(GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext nodeData,
-                                                                                                       object parentData,
-                                                                                                       TreeViewControl treeViewControl)
-        {
-            var waterLevelCalculationItem = new StrictContextMenuItem(
-                RiskeerCommonFormsResources.Calculate_All,
-                RiskeerCommonFormsResources.WaterLevel_Calculate_All_ToolTip,
-                RiskeerCommonFormsResources.CalculateAllIcon,
-                (sender, args) =>
-                {
-                    if (hydraulicBoundaryLocationCalculationGuiService == null)
-                    {
-                        return;
-                    }
-
-                    IAssessmentSection assessmentSection = nodeData.AssessmentSection;
-
-                    hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(
-                        nodeData.WrappedData,
-                        assessmentSection,
-                        nodeData.GetNormFunc(),
-                        nodeData.CategoryBoundaryName);
-                });
-
-            SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection,
-                                                        nodeData.GetNormFunc(),
-                                                        waterLevelCalculationItem);
-
-            var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
-            var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
-                GetInquiryHelper(),
-                RiskeerPluginHelper.FormatCategoryBoundaryName(nodeData.CategoryBoundaryName),
-                () => RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationIllustrationPoints(nodeData.WrappedData));
-
-            return builder.AddOpenItem()
-                          .AddSeparator()
-                          .AddCustomItem(waterLevelCalculationItem)
-                          .AddSeparator()
-                          .AddClearIllustrationPointsOfCalculationsItem(() => IllustrationPointsHelper.HasIllustrationPoints(nodeData.WrappedData), changeHandler)
-                          .AddSeparator()
-                          .AddPropertiesItem()
-                          .Build();
-        }
-
-        #endregion
-
-        #region GrassCoverErosionOutwardsWaveHeightCalculationsContext TreeNodeInfo
-
-        private ContextMenuStrip GrassCoverErosionOutwardsWaveHeightCalculationsContextMenuStrip(GrassCoverErosionOutwardsWaveHeightCalculationsContext nodeData,
-                                                                                                 object parentData,
-                                                                                                 TreeViewControl treeViewControl)
-        {
-            var waveHeightCalculationItem = new StrictContextMenuItem(
-                RiskeerCommonFormsResources.Calculate_All,
-                RiskeerCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
-                RiskeerCommonFormsResources.CalculateAllIcon,
-                (sender, args) =>
-                {
-                    if (hydraulicBoundaryLocationCalculationGuiService == null)
-                    {
-                        return;
-                    }
-
-                    IAssessmentSection assessmentSection = nodeData.AssessmentSection;
-
-                    hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(
-                        nodeData.WrappedData,
-                        assessmentSection,
-                        nodeData.GetNormFunc(),
-                        nodeData.CategoryBoundaryName);
-                });
-
-            SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection,
-                                                        nodeData.GetNormFunc(),
-                                                        waveHeightCalculationItem);
-
-            var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
-            var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
-                GetInquiryHelper(),
-                RiskeerPluginHelper.FormatCategoryBoundaryName(nodeData.CategoryBoundaryName),
-                () => RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationIllustrationPoints(nodeData.WrappedData));
-
-            return builder.AddOpenItem()
-                          .AddSeparator()
-                          .AddCustomItem(waveHeightCalculationItem)
-                          .AddSeparator()
-                          .AddClearIllustrationPointsOfCalculationsItem(() => IllustrationPointsHelper.HasIllustrationPoints(nodeData.WrappedData), changeHandler)
-                          .AddSeparator()
-                          .AddPropertiesItem()
-                          .Build();
-        }
-
-        #endregion
-
         #region GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext TreeNodeInfo
 
         private static object[] WaveConditionsCalculationGroupChildrenNodeObjects(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext nodeData)
@@ -1124,23 +1013,6 @@
             }
         }
 
-        private static void SetHydraulicsMenuItemEnabledStateAndTooltip(IAssessmentSection assessmentSection,
-                                                                        double norm,
-                                                                        StrictContextMenuItem menuItem)
-        {
-            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, menuItem);
-            if (!menuItem.Enabled)
-            {
-                return;
-            }
-
-            TargetProbabilityCalculationServiceHelper.ValidateTargetProbability(norm, logMessage =>
-            {
-                menuItem.Enabled = false;
-                menuItem.ToolTipText = logMessage;
-            });
-        }
-
         private static string EnableValidateAndCalculateMenuItem(IAssessmentSection assessmentSection)
         {
             return HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase);
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs
===================================================================
diff -u -ra896e1ccdbb02035d566fae14f811b486a78f60c -r69e52fada8dd520bce8d07411cda2eb8ec3d2268
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision a896e1ccdbb02035d566fae14f811b486a78f60c)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs	(.../GrassCoverErosionOutwardsPluginTest.cs)	(revision 69e52fada8dd520bce8d07411cda2eb8ec3d2268)
@@ -115,13 +115,11 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(11, treeNodeInfos.Length);
+                Assert.AreEqual(9, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsHydraulicLoadsContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsFailurePathContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<GrassCoverErosionOutwardsFailureMechanismSectionResult>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveHeightCalculationsContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveConditionsCalculationContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyGrassCoverErosionOutwardsOutput)));
Fisheye: Tag 69e52fada8dd520bce8d07411cda2eb8ec3d2268 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 69e52fada8dd520bce8d07411cda2eb8ec3d2268 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?