Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs
===================================================================
diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -ra8f322a9cea54ebf9134fdfd3cbb933456f25146
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs	(.../ClosingStructureUpdateDataStrategy.cs)	(revision fcad48d7beb394e1ac15cfe4289a7381e05aa883)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs	(.../ClosingStructureUpdateDataStrategy.cs)	(revision a8f322a9cea54ebf9134fdfd3cbb933456f25146)
@@ -24,6 +24,8 @@
 using System.Linq;
 using Core.Common.Base;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Service;
+using Ringtoets.ClosingStructures.Util;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.Forms;
@@ -55,11 +57,7 @@
 
         protected override IEnumerable<IObservable> RemoveObjectAndDependentData(ClosingStructure removedObject)
         {
-            return RingtoetsCommonDataSynchronizationService.RemoveStructure(
-                removedObject,
-                FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>(),
-                FailureMechanism.ClosingStructures,
-                FailureMechanism.SectionResults);
+            return ClosingStructuresDataSynchronizationService.RemoveStructure(removedObject, FailureMechanism);
         }
 
         #region Updating Data Functions
@@ -79,8 +77,8 @@
             affectedObjects.AddRange(GetAffectedCalculationsWithClosingStructure(structure)
                                          .Select(affectedCalculation => affectedCalculation.InputParameters));
 
-            affectedObjects.AddRange(StructuresHelper.UpdateCalculationToSectionResultAssignments(
-                                         FailureMechanism.SectionResults,
+            affectedObjects.AddRange(ClosingStructuresHelper.UpdateCalculationToSectionResultAssignments(
+                                         FailureMechanism.SectionResults2,
                                          FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>()));
 
             return affectedObjects;