Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs
===================================================================
diff -u -rb2fa3c06d32059473875aa82186750d50740606b -r12cec002453a1828efc68633fbd25219632c6c47
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision b2fa3c06d32059473875aa82186750d50740606b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision 12cec002453a1828efc68633fbd25219632c6c47)
@@ -25,6 +25,7 @@
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
+using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
@@ -334,7 +335,11 @@
             CollectionAssert.IsNotEmpty(sectionResultsWithStructure);
 
             // Call
-            IEnumerable<IObservable> affectedObjects = HeightStructuresDataSynchronizationService.RemoveStructure(failureMechanism, structure);
+            IEnumerable<IObservable> affectedObjects = RingtoetsCommonDataSynchronizationService.RemoveStructure(
+                structure,
+                failureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>(),
+                failureMechanism.HeightStructures,
+                failureMechanism.SectionResults);
 
             // Assert
             // Note: To make sure the clear is performed regardless of what is done with
@@ -374,17 +379,48 @@
         }
 
         [Test]
-        public void RemoveAllStructures_FailureMechanismNull_ThrowsArgumentNullException()
+        public void RemoveAllStructures_CalculationsNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => HeightStructuresDataSynchronizationService.RemoveAllStructures(null);
+            TestDelegate call = () => RingtoetsCommonDataSynchronizationService.RemoveAllStructures(
+                null,
+                new StructureCollection<HeightStructure>(),
+                Enumerable.Empty<StructuresFailureMechanismSectionResult<HeightStructuresInput>>());
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("failureMechanism", paramName);
+            Assert.AreEqual("calculations", paramName);
         }
 
         [Test]
+        public void RemoveAllStructures_StructuresNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => RingtoetsCommonDataSynchronizationService.RemoveAllStructures<HeightStructure, HeightStructuresInput>(
+                Enumerable.Empty<StructuresCalculation<HeightStructuresInput>>(),
+                null,
+                Enumerable.Empty<StructuresFailureMechanismSectionResult<HeightStructuresInput>>());
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("structures", paramName);
+        }
+
+        [Test]
+        public void RemoveAllStructures_SectionResultsNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => RingtoetsCommonDataSynchronizationService.RemoveAllStructures(
+                Enumerable.Empty<StructuresCalculation<HeightStructuresInput>>(),
+                new StructureCollection<HeightStructure>(),
+                null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("sectionResults", paramName);
+        }
+
+        [Test]
         public void RemoveAllStructures_FullyConfiguredFailureMechanism_RemoveAllHeightStructuresAndClearDependentData()
         {
             // Setup
@@ -404,7 +440,10 @@
             CollectionAssert.IsNotEmpty(calculationsWithStructure);
 
             // Call
-            IEnumerable<IObservable> observables = HeightStructuresDataSynchronizationService.RemoveAllStructures(failureMechanism);
+            IEnumerable<IObservable> observables = RingtoetsCommonDataSynchronizationService.RemoveAllStructures(
+                failureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>(),
+                failureMechanism.HeightStructures,
+                failureMechanism.SectionResults);
 
             // Assert
             // Note: To make sure the clear is performed regardless of what is done with