Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -rb98bf88b9a483d6fe9669cf2dd207f4c65e7b5f1
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision c5f90c4f9b42d985f16f99ad8732576b9217267a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision b98bf88b9a483d6fe9669cf2dd207f4c65e7b5f1)
@@ -542,7 +542,7 @@
                 var succesfullyRemovedData = calculationGroupContext.WrappedData.Children.Remove(pipingCalculationContext.WrappedData);
                 if (succesfullyRemovedData)
                 {
-                    RemoveCalculation(pipingCalculationContext.WrappedData, pipingCalculationContext.PipingFailureMechanism);
+                    RemoveCalculationFromSectionResult(pipingCalculationContext.WrappedData, pipingCalculationContext.PipingFailureMechanism);
                     calculationGroupContext.NotifyObservers();
                 }
             }
@@ -804,12 +804,7 @@
         private bool PipingCalculationGroupContextCanRemove(PipingCalculationGroupContext nodeData, object parentNodeData)
         {
             var group = parentNodeData as PipingCalculationGroupContext;
-            if (group != null)
-            {
-                return group.WrappedData.Children.Contains(nodeData.WrappedData);
-            }
-
-            return false;
+            return group != null && group.WrappedData.Children.Contains(nodeData.WrappedData);
         }
 
         private void PipingCalculationGroupContextOnNodeRemoved(PipingCalculationGroupContext nodeData, object parentNodeData)
@@ -821,14 +816,14 @@
 
                 foreach (var calculation in nodeData.WrappedData.GetCalculations().Cast<PipingCalculationScenario>())
                 {
-                    RemoveCalculation(calculation, nodeData.PipingFailureMechanism);
+                    RemoveCalculationFromSectionResult(calculation, nodeData.PipingFailureMechanism);
                 }
 
                 group.NotifyObservers();
             }
         }
 
-        private void RemoveCalculation(PipingCalculationScenario calculation, PipingFailureMechanism pipingFailureMechanism)
+        private void RemoveCalculationFromSectionResult(PipingCalculationScenario calculation, PipingFailureMechanism pipingFailureMechanism)
         {
             PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(calculation, pipingFailureMechanism);
         }