Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs
===================================================================
diff -u -r0403b90b2a1c32b0a8e37a2ca14141ba76bba502 -r3fa590784870b7a0692243d07cc47caa8929f47c
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs	(.../FailureMechanismContributionNormChangeHandler.cs)	(revision 0403b90b2a1c32b0a8e37a2ca14141ba76bba502)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs	(.../FailureMechanismContributionNormChangeHandler.cs)	(revision 3fa590784870b7a0692243d07cc47caa8929f47c)
@@ -29,6 +29,7 @@
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.Contribution;
 using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Common.Service;
 using Riskeer.Integration.Forms.PropertyClasses;
 using Riskeer.Integration.Plugin.Properties;
 using Riskeer.Integration.Service;
@@ -146,9 +147,10 @@
 
         private IEnumerable<IObservable> ClearNormDependingHydraulicBoundaryLocationCalculationOutput(bool normativeNorm)
         {
-            IEnumerable<HydraulicBoundaryLocationCalculation> calculationsToClear = GetHydraulicBoundaryLocationCalculations(normativeNorm);
+            IEnumerable<HydraulicBoundaryLocationCalculation> calculationsToClear = GetHydraulicBoundaryLocationCalculationsToClear(normativeNorm);
 
-            IEnumerable<IObservable> affectedObjects = RiskeerDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(calculationsToClear);
+            IEnumerable<IObservable> affectedObjects = RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(calculationsToClear)
+                                                                                              .ToArray();
 
             if (affectedObjects.Any())
             {
@@ -158,7 +160,7 @@
             return affectedObjects;
         }
 
-        private IEnumerable<HydraulicBoundaryLocationCalculation> GetHydraulicBoundaryLocationCalculations(bool normativeNorm)
+        private IEnumerable<HydraulicBoundaryLocationCalculation> GetHydraulicBoundaryLocationCalculationsToClear(bool normativeNorm)
         {
             return normativeNorm
                        ? assessmentSection.FailureMechanismContribution.NormativeNorm == NormType.LowerLimit
Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs
===================================================================
diff -u -r97c86c985e6c699f59b56a0a9f4a5fe0ea8597d3 -r3fa590784870b7a0692243d07cc47caa8929f47c
--- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs	(.../RiskeerDataSynchronizationService.cs)	(revision 97c86c985e6c699f59b56a0a9f4a5fe0ea8597d3)
+++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs	(.../RiskeerDataSynchronizationService.cs)	(revision 3fa590784870b7a0692243d07cc47caa8929f47c)
@@ -191,24 +191,6 @@
         }
 
         /// <summary>
-        /// Clears the hydraulic boundary location calculation output of the given <paramref name="calculations"/>.
-        /// </summary>
-        /// <param name="calculations">The collection  of <see cref="HydraulicBoundaryLocationCalculation"/> to clear.</param>
-        /// <returns>All objects affected by the operation.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculations"/> is <c>null</c>.</exception>
-        public static IEnumerable<IObservable> ClearHydraulicBoundaryLocationCalculationOutput(
-            IEnumerable<HydraulicBoundaryLocationCalculation> calculations)
-        {
-            if (calculations == null)
-            {
-                throw new ArgumentNullException(nameof(calculations));
-            }
-
-            return RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(calculations)
-                                                          .ToArray();
-        }
-
-        /// <summary>
         /// Clears the hydraulic boundary location calculation output that is contained 
         /// within specific failure mechanisms of the <paramref name="assessmentSection"/>.
         /// </summary>
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -r0403b90b2a1c32b0a8e37a2ca14141ba76bba502 -r3fa590784870b7a0692243d07cc47caa8929f47c
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 0403b90b2a1c32b0a8e37a2ca14141ba76bba502)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 3fa590784870b7a0692243d07cc47caa8929f47c)
@@ -357,45 +357,6 @@
         }
 
         [Test]
-        public void ClearHydraulicBoundaryLocationCalculationOutput_CalculationsNull_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => RiskeerDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput((IEnumerable<HydraulicBoundaryLocationCalculation>) null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("calculations", exception.ParamName);
-        }
-
-        [Test]
-        public void ClearHydraulicBoundaryLocationCalculationOutput_WithCalculations_ClearDataAndReturnAffectedObjects()
-        {
-            // Setup
-            var hydraulicBoundaryLocation1 = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation();
-
-            var calculations = new[]
-            {
-                new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation1)
-                {
-                    Output = new TestHydraulicBoundaryLocationCalculationOutput()
-                },
-                new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation2)
-                {
-                    Output = new TestHydraulicBoundaryLocationCalculationOutput()
-                }
-            };
-
-            // Call
-            IEnumerable<IObservable> affectedObjects = RiskeerDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(calculations);
-
-            // Assert
-
-            CollectionAssert.AreEquivalent(calculations, affectedObjects);
-            Assert.IsTrue(calculations.All(c => !c.HasOutput));
-        }
-
-        [Test]
         public void ClearHydraulicBoundaryLocationCalculationOutput_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call