Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rd0553e74a8d5ff6534acf03faf4a8801c28bf7c0 -r6b43c39e0f54d1054729aaed5aa6dc19149ef72a
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision d0553e74a8d5ff6534acf03faf4a8801c28bf7c0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 6b43c39e0f54d1054729aaed5aa6dc19149ef72a)
@@ -108,21 +108,11 @@
                 FailureMechanismContextMenuStrip,
                 Gui);
 
-//            yield return new TreeNodeInfo<PipingCalculationScenarioContext>
-//            {
-//                ContextMenuStrip = PipingCalculationContextContextMenuStrip,
-//                ChildNodeObjects = PipingCalculationContextChildNodeObjects,
-//                CanRename = (pipingCalculationContext, parentData) => true,
-//                OnNodeRenamed = PipingCalculationContextOnNodeRenamed,
-//                CanRemove = PipingCalculationContextCanRemove,
-//                OnNodeRemoved = PipingCalculationContextOnNodeRemoved,
-//                CanDrag = (pipingCalculationContext, parentData) => true
-//            };
-
             yield return CalculationTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo<PipingCalculationScenarioContext>(
                 PipingFormsResources.PipingIcon,
                 PipingCalculationContextChildNodeObjects,
-                PipingCalculationContextContextMenuStrip);
+                PipingCalculationContextContextMenuStrip,
+                PipingCalculationContextOnNodeRemoved);
 
             yield return CalculationTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo<PipingCalculationGroupContext>(
                 PipingCalculationGroupContextChildNodeObjects,
@@ -499,18 +489,6 @@
             return childNodes.ToArray();
         }
 
-        private static void PipingCalculationContextOnNodeRenamed(PipingCalculationScenarioContext pipingCalculationScenarioContext, string newName)
-        {
-            pipingCalculationScenarioContext.WrappedData.Name = newName;
-            pipingCalculationScenarioContext.WrappedData.NotifyObservers();
-        }
-
-        private bool PipingCalculationContextCanRemove(PipingCalculationScenarioContext pipingCalculationScenarioContext, object parentNodeData)
-        {
-            var calculationGroupContext = parentNodeData as PipingCalculationGroupContext;
-            return calculationGroupContext != null && calculationGroupContext.WrappedData.Children.Contains(pipingCalculationScenarioContext.WrappedData);
-        }
-
         private void PipingCalculationContextOnNodeRemoved(PipingCalculationScenarioContext pipingCalculationScenarioContext, object parentNodeData)
         {
             var calculationGroupContext = parentNodeData as PipingCalculationGroupContext;