Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -reff17c44b14a8e6f3e6fb7ee123f967b552df6a2 -r3ff488a27f75d080db7cf4e13f508ba5555516df
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision eff17c44b14a8e6f3e6fb7ee123f967b552df6a2)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 3ff488a27f75d080db7cf4e13f508ba5555516df)
@@ -545,7 +545,7 @@
                 var succesfullyRemovedData = calculationGroupContext.WrappedData.Children.Remove(pipingCalculationScenarioContext.WrappedData);
                 if (succesfullyRemovedData)
                 {
-                    RemoveCalculationFromSectionResult(pipingCalculationScenarioContext.WrappedData, pipingCalculationScenarioContext.FailureMechanism);
+                    PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(pipingCalculationScenarioContext.WrappedData, pipingCalculationScenarioContext.FailureMechanism);
                     calculationGroupContext.NotifyObservers();
                 }
             }
@@ -603,6 +603,8 @@
         private ContextMenuStrip PipingCalculationGroupContextContextMenuStrip(PipingCalculationGroupContext nodeData, object parentData, TreeViewControl treeViewControl)
         {
             var group = nodeData.WrappedData;
+            var builder = Gui.Get(nodeData, treeViewControl);
+            var isNestedGroup = parentData is PipingCalculationGroupContext;
 
             var generateCalculationsItem = CreateGeneratePipingCalculationsItem(nodeData);
             var validateAllItem = CreateValidateAllItem(group);
@@ -630,9 +632,7 @@
                 clearAllItem.ToolTipText = PipingFormsResources.PipingCalculationGroup_ClearOutput_No_calculation_with_output_to_clear;
             }
 
-            var builder = Gui.Get(nodeData, treeViewControl);
-
-            if (parentData is PipingFailureMechanismContext)
+            if (!isNestedGroup)
             {
                 builder
                     .AddOpenItem()
@@ -651,20 +651,10 @@
                 .AddCustomItem(clearAllItem)
                 .AddSeparator();
 
-            var isRenamable = PipingCalculationGroupContextCanRenameNode(nodeData, parentData);
-            var isRemovable = PipingCalculationGroupContextCanRemove(nodeData, parentData);
-
-            if (isRenamable)
+            if (isNestedGroup)
             {
                 builder.AddRenameItem();
-            }
-            if (isRemovable)
-            {
                 builder.AddDeleteItem();
-            }
-
-            if (isRemovable || isRenamable)
-            {
                 builder.AddSeparator();
             }
 
@@ -775,17 +765,6 @@
             }
         }
 
-        private bool PipingCalculationGroupContextCanRenameNode(PipingCalculationGroupContext pipingCalculationGroupContext, object parentData)
-        {
-            return !(parentData is PipingFailureMechanismContext);
-        }
-
-        private bool PipingCalculationGroupContextCanRemove(PipingCalculationGroupContext nodeData, object parentNodeData)
-        {
-            var group = parentNodeData as PipingCalculationGroupContext;
-            return group != null && group.WrappedData.Children.Contains(nodeData.WrappedData);
-        }
-
         private void PipingCalculationGroupContextOnNodeRemoved(PipingCalculationGroupContext nodeData, object parentNodeData)
         {
             var parentGroupContext = (PipingCalculationGroupContext) parentNodeData;
@@ -794,17 +773,12 @@
 
             foreach (var calculation in nodeData.WrappedData.GetCalculations().Cast<PipingCalculationScenario>())
             {
-                RemoveCalculationFromSectionResult(calculation, nodeData.FailureMechanism);
+                PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(calculation, nodeData.FailureMechanism);
             }
 
             parentGroupContext.NotifyObservers();
         }
 
-        private void RemoveCalculationFromSectionResult(PipingCalculationScenario calculation, PipingFailureMechanism pipingFailureMechanism)
-        {
-            PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(calculation, pipingFailureMechanism);
-        }
-
         #endregion
     }
 }
\ No newline at end of file