Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -reffd6e0c3416420a4f5fbb0575b9a3369caf70fe -rb6993e964bc966bd9fa07dc8962dca7f6fbaab70
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision effd6e0c3416420a4f5fbb0575b9a3369caf70fe)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision b6993e964bc966bd9fa07dc8962dca7f6fbaab70)
@@ -616,29 +616,7 @@
             var generateCalculationsItem = CreateGeneratePipingCalculationsItem(nodeData);
             var validateAllItem = CreateValidateAllItem(group);
             var calculateAllItem = CreateCalculateAllItem(group);
-            var clearAllItem = new StrictContextMenuItem(
-                RingtoetsCommonFormsResources.Clear_all_output,
-                PipingFormsResources.PipingCalculationGroup_ClearOutput_ToolTip,
-                RingtoetsCommonFormsResources.ClearIcon, (o, args) =>
-                {
-                    if (MessageBox.Show(PipingFormsResources.PipingCalculationGroupContext_ContextMenuStrip_Are_you_sure_clear_all_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK)
-                    {
-                        return;
-                    }
 
-                    foreach (PipingCalculation calc in group.GetCalculations().Where(c => c.HasOutput))
-                    {
-                        calc.ClearOutput();
-                        calc.NotifyObservers();
-                    }
-                });
-
-            if (!nodeData.WrappedData.GetCalculations().Any(c => c.HasOutput))
-            {
-                clearAllItem.Enabled = false;
-                clearAllItem.ToolTipText = PipingFormsResources.PipingCalculationGroup_ClearOutput_No_calculation_with_output_to_clear;
-            }
-
             if (!isNestedGroup)
             {
                 builder
@@ -654,9 +632,9 @@
 
             builder
                 .AddCustomItem(validateAllItem)
-                .AddCustomItem(calculateAllItem)
-                .AddCustomItem(clearAllItem)
-                .AddSeparator();
+                .AddCustomItem(calculateAllItem);
+            CalculationTreeNodeInfoFactory.AddClearAllCalculationOutputInGroupItem(builder, group);
+            builder.AddSeparator();
 
             if (isNestedGroup)
             {