Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rfb1b2aaa6f43cb1e3ddd3a8ec59f37dc82de0702 -r656b7946c1c0f7585fcb139341480e3bbcb95fb5
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision fb1b2aaa6f43cb1e3ddd3a8ec59f37dc82de0702)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 656b7946c1c0f7585fcb139341480e3bbcb95fb5)
@@ -391,34 +391,6 @@
                 AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
             };
 
-            yield return new ViewInfo<DesignWaterLevelCalculationsContext, IObservableEnumerable<HydraulicBoundaryLocationCalculation>, DesignWaterLevelCalculationsView>
-            {
-                GetViewName = (view, context) => $"{RiskeerCommonFormsResources.WaterLevelCalculations_DisplayName} - " +
-                                                 $"{RiskeerPluginHelper.FormatCategoryBoundaryName(context.CategoryBoundaryName)}",
-                GetViewData = context => context.WrappedData,
-                Image = RiskeerCommonFormsResources.GenericInputOutputIcon,
-                CloseForData = CloseHydraulicBoundaryCalculationsViewForData,
-                CreateInstance = context => new DesignWaterLevelCalculationsView(context.WrappedData,
-                                                                                 context.AssessmentSection,
-                                                                                 context.GetNormFunc,
-                                                                                 () => context.CategoryBoundaryName),
-                AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
-            };
-
-            yield return new ViewInfo<WaveHeightCalculationsContext, IObservableEnumerable<HydraulicBoundaryLocationCalculation>, WaveHeightCalculationsView>
-            {
-                GetViewName = (view, context) => $"{RiskeerCommonFormsResources.WaveHeightCalculations_DisplayName} - " +
-                                                 $"{RiskeerPluginHelper.FormatCategoryBoundaryName(context.CategoryBoundaryName)}",
-                GetViewData = context => context.WrappedData,
-                Image = RiskeerCommonFormsResources.GenericInputOutputIcon,
-                CloseForData = CloseHydraulicBoundaryCalculationsViewForData,
-                CreateInstance = context => new WaveHeightCalculationsView(context.WrappedData,
-                                                                           context.AssessmentSection,
-                                                                           context.GetNormFunc,
-                                                                           () => context.CategoryBoundaryName),
-                AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
-            };
-
             yield return new ViewInfo<AssessmentSectionStateRootContext, AssessmentSectionReferenceLineView>
             {
                 GetViewName = (view, context) => RiskeerFormsResources.AssessmentSectionMap_DisplayName,
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rfb1b2aaa6f43cb1e3ddd3a8ec59f37dc82de0702 -r656b7946c1c0f7585fcb139341480e3bbcb95fb5
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision fb1b2aaa6f43cb1e3ddd3a8ec59f37dc82de0702)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 656b7946c1c0f7585fcb139341480e3bbcb95fb5)
@@ -232,7 +232,7 @@
                 PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(29, propertyInfos.Length);
+                Assert.AreEqual(27, propertyInfos.Length);
 
                 PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
@@ -398,7 +398,7 @@
                 ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(35, viewInfos.Length);
+                Assert.AreEqual(33, viewInfos.Length);
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
@@ -426,18 +426,6 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(DesignWaterLevelCalculationsContext),
-                    typeof(IObservableEnumerable<HydraulicBoundaryLocationCalculation>),
-                    typeof(DesignWaterLevelCalculationsView));
-
-                PluginTestHelper.AssertViewInfoDefined(
-                    viewInfos,
-                    typeof(WaveHeightCalculationsContext),
-                    typeof(IObservableEnumerable<HydraulicBoundaryLocationCalculation>),
-                    typeof(WaveHeightCalculationsView));
-
-                PluginTestHelper.AssertViewInfoDefined(
-                    viewInfos,
                     typeof(AssessmentSectionStateRootContext),
                     typeof(AssessmentSectionReferenceLineView));