Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r2f4ab8ae59075bc9fe42f07604d2d72bb685531d -r6f46ce9a263e50bca4ff0cb32973f330defd6f3b
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 2f4ab8ae59075bc9fe42f07604d2d72bb685531d)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 6f46ce9a263e50bca4ff0cb32973f330defd6f3b)
@@ -673,26 +673,8 @@
         private void OnClosingStructureRemoved(ClosingStructure nodeData, object parentData)
         {
             var parentContext = (ClosingStructuresContext) parentData;
-            var changedObservables = new List<IObservable>();
-            StructuresCalculation<ClosingStructuresInput>[] closingStructureCalculations = parentContext
-                .FailureMechanism.Calculations
-                .Cast<StructuresCalculation<ClosingStructuresInput>>()
-                .ToArray();
-            StructuresCalculation<ClosingStructuresInput>[] calculationWithRemovedClosingStructure = closingStructureCalculations
-                .Where(c => ReferenceEquals(c.InputParameters.Structure, nodeData))
-                .ToArray();
-            foreach (StructuresCalculation<ClosingStructuresInput> calculation in calculationWithRemovedClosingStructure)
-            {
-                calculation.InputParameters.Structure = null;
-                StructuresHelper.Delete(parentContext.FailureMechanism.SectionResults,
-                                        calculation,
-                                        closingStructureCalculations);
-                changedObservables.Add(calculation.InputParameters);
-            }
-
-            parentContext.WrappedData.Remove(nodeData);
-            changedObservables.Add(parentContext.WrappedData);
-
+            IEnumerable<IObservable> changedObservables = ClosingStructuresDataSynchronizationService.RemoveStructure(parentContext.FailureMechanism,
+                                                                                                                      nodeData);
             foreach (IObservable observable in changedObservables)
             {
                 observable.NotifyObservers();