Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r363300c699ad66d46344a53e0c2041c9dab281e0 -r8481ca19b1727f44ea251b88146a8621088cf406
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 363300c699ad66d46344a53e0c2041c9dab281e0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 8481ca19b1727f44ea251b88146a8621088cf406)
@@ -2086,17 +2086,9 @@
                         return;
                     }
 
-                    IEnumerable<CalculatableActivity> activities =
-                        DesignWaterLevelCalculationsGroupContextChildNodeObjects(nodeData)
-                            .Cast<DesignWaterLevelCalculationsContext>()
-                            .SelectMany(context => HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                            assessmentSection,
-                                            context.WrappedData,
-                                            context.GetNormFunc(),
-                                            context.CategoryBoundaryName))
-                            .ToArray();
-
-                    ActivityProgressDialogRunner.Run(Gui.MainWindow, activities);
+                    ActivityProgressDialogRunner.Run(
+                        Gui.MainWindow, 
+                        AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(assessmentSection));
                 });
 
             SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, designWaterLevelItem);
@@ -2124,17 +2116,9 @@
                         return;
                     }
 
-                    IEnumerable<CalculatableActivity> activities =
-                        WaveHeightCalculationsGroupContextChildNodeObjects(nodeData)
-                            .Cast<WaveHeightCalculationsContext>()
-                            .SelectMany(context => HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                            assessmentSection,
-                                            context.WrappedData,
-                                            context.GetNormFunc(),
-                                            context.CategoryBoundaryName))
-                            .ToArray();
-
-                    ActivityProgressDialogRunner.Run(Gui.MainWindow, activities);
+                    ActivityProgressDialogRunner.Run(
+                        Gui.MainWindow, 
+                        AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(assessmentSection));
                 });
 
             SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem);