Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -r3bd79dc878fa0b81b1ebb5c35dd5612f2bfed356 -r9643d7e5bbb27a7782b5d939b029a70a1c023138
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 3bd79dc878fa0b81b1ebb5c35dd5612f2bfed356)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 9643d7e5bbb27a7782b5d939b029a70a1c023138)
@@ -433,22 +433,9 @@
 
             builder.AddCustomItem(validateItem);
             CalculationTreeNodeInfoFactory.AddPerformCalculationItem(builder, calculation, PerformCalculation);
+            CalculationTreeNodeInfoFactory.AddClearCalculationOutputItem(builder, calculation);
+            builder.AddSeparator();
 
-            var clearOutputItem = new StrictContextMenuItem(PipingFormsResources.Clear_output,
-                                                            PipingFormsResources.Clear_output_ToolTip,
-                                                            RingtoetsCommonFormsResources.ClearIcon,
-                                                            (o, args) => ClearOutput(calculation));
-
-            if (!calculation.HasOutput)
-            {
-                clearOutputItem.Enabled = false;
-                clearOutputItem.ToolTipText = PipingFormsResources.ClearOutput_No_output_to_clear;
-            }
-
-            builder
-                .AddCustomItem(clearOutputItem)
-                .AddSeparator();
-
             return builder
                       .AddRenameItem()
                       .AddDeleteItem()
@@ -504,17 +491,6 @@
             }
         }
 
-        private static void ClearOutput(PipingCalculation calculation)
-        {
-            if (MessageBox.Show(PipingFormsResources.PipingCalculationContext_ContextMenuStrip_Are_you_sure_clear_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK)
-            {
-                return;
-            }
-
-            calculation.ClearOutput();
-            calculation.NotifyObservers();
-        }
-
         private void PerformCalculation(ICalculation calculation)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow, new PipingCalculationActivity((PipingCalculation)calculation));