Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs
===================================================================
diff -u -rb14f85d007791f99296896e4a940a0e97ae6d8cf -r0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc
--- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs	(.../RiskeerDataSynchronizationService.cs)	(revision b14f85d007791f99296896e4a940a0e97ae6d8cf)
+++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs	(.../RiskeerDataSynchronizationService.cs)	(revision 0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc)
@@ -126,30 +126,15 @@
                 throw new ArgumentNullException(nameof(assessmentSection));
             }
 
-            return ClearFailureMechanismCalculationOutputs(assessmentSection.GetFailureMechanisms());
-        }
-
-        /// <summary>
-        /// Clears the output of all calculations of the given <paramref name="failureMechanisms"/>.
-        /// </summary>
-        /// <param name="failureMechanisms">The failure mechanisms that contain the calculations.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> of calculations that are affected by clearing the output.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanisms"/> is <c>null</c>.</exception>
-        public static IEnumerable<IObservable> ClearFailureMechanismCalculationOutputs(IEnumerable<IFailureMechanism> failureMechanisms)
-        {
-            if (failureMechanisms == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanisms));
-            }
-
             var changedObservables = new List<IObservable>();
 
-            foreach (IFailureMechanism failureMechanism in failureMechanisms)
+            foreach (IFailureMechanism failureMechanism in assessmentSection.GetFailureMechanisms())
             {
                 switch (failureMechanism)
                 {
                     case PipingFailureMechanism pipingFailureMechanism:
-                        changedObservables.AddRange(PipingDataSynchronizationService.ClearAllCalculationOutput(pipingFailureMechanism));
+                        changedObservables.AddRange(PipingDataSynchronizationService.ClearAllSemiProbabilisticCalculationOutputWithoutManualAssessmentLevel(pipingFailureMechanism));
+                        changedObservables.AddRange(PipingDataSynchronizationService.ClearAllProbabilisticCalculationOutput(pipingFailureMechanism));
                         break;
                     case GrassCoverErosionInwardsFailureMechanism grassCoverErosionInwardsFailureMechanism:
                         changedObservables.AddRange(GrassCoverErosionInwardsDataSynchronizationService.ClearAllCalculationOutput(grassCoverErosionInwardsFailureMechanism));
@@ -173,7 +158,7 @@
                         changedObservables.AddRange(StabilityPointStructuresDataSynchronizationService.ClearAllCalculationOutput(stabilityPointStructuresFailureMechanism));
                         break;
                     case MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism:
-                        changedObservables.AddRange(MacroStabilityInwardsDataSynchronizationService.ClearAllCalculationOutput(macroStabilityInwardsFailureMechanism));
+                        changedObservables.AddRange(MacroStabilityInwardsDataSynchronizationService.ClearAllCalculationOutputWithoutManualAssessmentLevel(macroStabilityInwardsFailureMechanism));
                         break;
                 }
             }
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs
===================================================================
diff -u -r270ab241e81b1049a6dc9ef0ce540f290039e82e -r0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 270ab241e81b1049a6dc9ef0ce540f290039e82e)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs	(.../RiskeerDataSynchronizationServiceTest.cs)	(revision 0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc)
@@ -64,10 +64,10 @@
     public class RiskeerDataSynchronizationServiceTest
     {
         [Test]
-        public void ClearFailureMechanismCalculationOutputs_WithoutAssessmentSection_ThrowsArgumentNullException()
+        public void ClearFailureMechanismCalculationOutputs_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => RiskeerDataSynchronizationService.ClearFailureMechanismCalculationOutputs((IAssessmentSection) null);
+            void Call() => RiskeerDataSynchronizationService.ClearFailureMechanismCalculationOutputs(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -79,61 +79,71 @@
         {
             // Setup
             AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations();
-            IEnumerable<ICalculation> expectedAffectedItems = assessmentSection.GetFailureMechanisms()
-                                                                               .SelectMany(f => f.Calculations)
-                                                                               .Where(c => c.HasOutput)
-                                                                               .ToList();
+            var expectedAffectedItems = new List<IObservable>();
 
+            expectedAffectedItems.AddRange(assessmentSection.ClosingStructures.Calculations
+                                                            .Cast<StructuresCalculation<ClosingStructuresInput>>()
+                                                            .Where(c => c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.GrassCoverErosionInwards.Calculations
+                                                            .Cast<GrassCoverErosionInwardsCalculation>()
+                                                            .Where(c => c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.GrassCoverErosionOutwards.Calculations
+                                                            .Cast<GrassCoverErosionOutwardsWaveConditionsCalculation>()
+                                                            .Where(c => c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.HeightStructures.Calculations
+                                                            .Cast<StructuresCalculation<HeightStructuresInput>>()
+                                                            .Where(c => c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.Piping.Calculations
+                                                            .OfType<SemiProbabilisticPipingCalculationScenario>()
+                                                            .Where(c => !c.InputParameters.UseAssessmentLevelManualInput && c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.Piping.Calculations
+                                                            .OfType<ProbabilisticPipingCalculationScenario>()
+                                                            .Where(c => c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.StabilityPointStructures.Calculations
+                                                            .Cast<StructuresCalculation<StabilityPointStructuresInput>>()
+                                                            .Where(c => c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.StabilityStoneCover.Calculations
+                                                            .Cast<StabilityStoneCoverWaveConditionsCalculation>()
+                                                            .Where(c => c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.WaveImpactAsphaltCover.Calculations
+                                                            .Cast<WaveImpactAsphaltCoverWaveConditionsCalculation>()
+                                                            .Where(c => c.HasOutput));
+            expectedAffectedItems.AddRange(assessmentSection.MacroStabilityInwards.Calculations
+                                                            .Cast<MacroStabilityInwardsCalculation>()
+                                                            .Where(c => c.HasOutput));
+
             // Call
             IEnumerable<IObservable> affectedItems = RiskeerDataSynchronizationService.ClearFailureMechanismCalculationOutputs(assessmentSection);
 
             // Assert
             // Note: To make sure the clear is performed regardless of what is done with
             // the return result, no ToArray() should be called before these assertions:
-            CollectionAssert.IsEmpty(assessmentSection.GetFailureMechanisms()
-                                                      .SelectMany(f => f.Calculations)
-                                                      .Where(c => c.HasOutput));
+            Assert.IsTrue(assessmentSection.ClosingStructures.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>()
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.GrassCoverErosionInwards.Calculations.Cast<GrassCoverErosionInwardsCalculation>()
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.GrassCoverErosionOutwards.Calculations.Cast<GrassCoverErosionOutwardsWaveConditionsCalculation>()
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.HeightStructures.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>()
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.Piping.Calculations.OfType<SemiProbabilisticPipingCalculationScenario>()
+                                           .Where(c => !c.InputParameters.UseAssessmentLevelManualInput)
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.Piping.Calculations.OfType<ProbabilisticPipingCalculationScenario>()
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.StabilityPointStructures.Calculations.Cast<StructuresCalculation<StabilityPointStructuresInput>>()
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.StabilityStoneCover.Calculations.Cast<StabilityStoneCoverWaveConditionsCalculation>()
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.WaveImpactAsphaltCover.Calculations.Cast<WaveImpactAsphaltCoverWaveConditionsCalculation>()
+                                           .All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.MacroStabilityInwards.Calculations.Cast<MacroStabilityInwardsCalculation>()
+                                           .All(c => !c.InputParameters.UseAssessmentLevelManualInput && !c.HasOutput));
 
             CollectionAssert.AreEquivalent(expectedAffectedItems, affectedItems);
         }
 
         [Test]
-        public void ClearFailureMechanismCalculationOutputs_WithoutFailureMechanisms_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => RiskeerDataSynchronizationService.ClearFailureMechanismCalculationOutputs((IEnumerable<IFailureMechanism>) null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("failureMechanisms", exception.ParamName);
-        }
-
-        [Test]
-        public void ClearFailureMechanismCalculationOutputs_WithFailureMechanisms_ClearsFailureMechanismCalculationsOutputAndReturnsAffectedCalculations()
-        {
-            // Setup
-            IEnumerable<IFailureMechanism> failureMechanisms = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations()
-                                                                                .GetFailureMechanisms()
-                                                                                .ToList();
-            IEnumerable<ICalculation> expectedAffectedItems = failureMechanisms
-                                                              .SelectMany(f => f.Calculations)
-                                                              .Where(c => c.HasOutput)
-                                                              .ToList();
-
-            // Call
-            IEnumerable<IObservable> affectedItems = RiskeerDataSynchronizationService.ClearFailureMechanismCalculationOutputs(failureMechanisms);
-
-            // Assert
-            // Note: To make sure the clear is performed regardless of what is done with
-            // the return result, no ToArray() should be called before these assertions:
-            CollectionAssert.IsEmpty(failureMechanisms
-                                     .SelectMany(f => f.Calculations)
-                                     .Where(c => c.HasOutput));
-
-            CollectionAssert.AreEquivalent(expectedAffectedItems, affectedItems);
-        }
-
-        [Test]
         public void ClearAllSemiProbabilisticCalculationOutput_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call
@@ -330,7 +340,8 @@
             Assert.IsTrue(assessmentSection.HeightStructures.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>()
                                            .All(c => c.InputParameters.HydraulicBoundaryLocation == null && !c.HasOutput));
             Assert.IsTrue(assessmentSection.Piping.Calculations.OfType<SemiProbabilisticPipingCalculationScenario>()
-                                           .All(c => !c.InputParameters.UseAssessmentLevelManualInput && !c.HasOutput));
+                                           .Where(c => !c.InputParameters.UseAssessmentLevelManualInput)
+                                           .All(c => !c.HasOutput));
             Assert.IsTrue(assessmentSection.Piping.Calculations.OfType<ProbabilisticPipingCalculationScenario>()
                                            .All(c => !c.HasOutput));
             Assert.IsTrue(assessmentSection.Piping.Calculations.Cast<IPipingCalculationScenario<PipingInput>>()
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs
===================================================================
diff -u -r741b9d245ecf082a4faf99642c0c2335d3e4eb0c -r0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs	(.../MacroStabilityInwardsDataSynchronizationService.cs)	(revision 741b9d245ecf082a4faf99642c0c2335d3e4eb0c)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs	(.../MacroStabilityInwardsDataSynchronizationService.cs)	(revision 0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc)
@@ -39,25 +39,6 @@
     public static class MacroStabilityInwardsDataSynchronizationService
     {
         /// <summary>
-        /// Clears the output for all calculations in the <see cref="MacroStabilityInwardsFailureMechanism"/>.
-        /// </summary>
-        /// <param name="failureMechanism">The <see cref="MacroStabilityInwardsFailureMechanism"/> which contains the calculations.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> of calculations which are affected by clearing the output.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
-        public static IEnumerable<IObservable> ClearAllCalculationOutput(MacroStabilityInwardsFailureMechanism failureMechanism)
-        {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-
-            return failureMechanism.Calculations
-                                   .Cast<MacroStabilityInwardsCalculation>()
-                                   .SelectMany(RiskeerCommonDataSynchronizationService.ClearCalculationOutput)
-                                   .ToArray();
-        }
-
-        /// <summary>
         /// Clears the output for all calculations in the <see cref="MacroStabilityInwardsFailureMechanism"/>,
         /// except where <see cref="MacroStabilityInwardsInput.UseAssessmentLevelManualInput"/> is <c>true</c>.
         /// </summary>
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r514fc2d1d9096ef2d86ff87526fd3ecf001e065b -r0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs	(.../MacroStabilityInwardsDataSynchronizationServiceTest.cs)	(revision 514fc2d1d9096ef2d86ff87526fd3ecf001e065b)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs	(.../MacroStabilityInwardsDataSynchronizationServiceTest.cs)	(revision 0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc)
@@ -38,37 +38,6 @@
     public class MacroStabilityInwardsDataSynchronizationServiceTest
     {
         [Test]
-        public void ClearAllCalculationOutput_FailureMechanismNull_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => MacroStabilityInwardsDataSynchronizationService.ClearAllCalculationOutput(null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("failureMechanism", exception.ParamName);
-        }
-
-        [Test]
-        public void ClearAllCalculationOutput_WithVariousCalculations_ClearsCalculationsOutputAndReturnsAffectedCalculations()
-        {
-            // Setup
-            MacroStabilityInwardsFailureMechanism failureMechanism = MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsFailureMechanismWithAllCalculationConfigurations();
-            ICalculation[] expectedAffectedCalculations = failureMechanism.Calculations
-                                                                          .Where(c => c.HasOutput)
-                                                                          .ToArray();
-
-            // Call
-            IEnumerable<IObservable> affectedItems = MacroStabilityInwardsDataSynchronizationService.ClearAllCalculationOutput(failureMechanism);
-
-            // Assert
-            // Note: To make sure the clear is performed regardless of what is done with
-            // the return result, no ToArray() should be called before these assertions:
-            Assert.IsTrue(failureMechanism.Calculations.All(c => !c.HasOutput));
-
-            CollectionAssert.AreEquivalent(expectedAffectedCalculations, affectedItems);
-        }
-
-        [Test]
         public void ClearAllCalculationOutputWithoutManualAssessmentLevel_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Call
Index: Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs
===================================================================
diff -u -r741b9d245ecf082a4faf99642c0c2335d3e4eb0c -r0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc
--- Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs	(.../PipingDataSynchronizationService.cs)	(revision 741b9d245ecf082a4faf99642c0c2335d3e4eb0c)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/PipingDataSynchronizationService.cs	(.../PipingDataSynchronizationService.cs)	(revision 0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc)
@@ -43,25 +43,6 @@
     public static class PipingDataSynchronizationService
     {
         /// <summary>
-        /// Clears the output for all calculations in the <see cref="PipingFailureMechanism"/>.
-        /// </summary>
-        /// <param name="failureMechanism">The <see cref="PipingFailureMechanism"/> which contains the calculations.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> of calculations which are affected by clearing the output.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
-        public static IEnumerable<IObservable> ClearAllCalculationOutput(PipingFailureMechanism failureMechanism)
-        {
-            if (failureMechanism == null)
-            {
-                throw new ArgumentNullException(nameof(failureMechanism));
-            }
-
-            return failureMechanism.Calculations
-                                   .Cast<IPipingCalculationScenario<PipingInput>>()
-                                   .SelectMany(RiskeerCommonDataSynchronizationService.ClearCalculationOutput)
-                                   .ToArray();
-        }
-
-        /// <summary>
         /// Clears the output for all <see cref="SemiProbabilisticPipingCalculationScenario"/> in the <see cref="PipingFailureMechanism"/>,
         /// except for the <see cref="SemiProbabilisticPipingCalculationScenario"/> where
         /// <see cref="SemiProbabilisticPipingInput.UseAssessmentLevelManualInput"/> is <c>true</c>.
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs
===================================================================
diff -u -r514fc2d1d9096ef2d86ff87526fd3ecf001e065b -r0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 514fc2d1d9096ef2d86ff87526fd3ecf001e065b)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs	(.../PipingDataSynchronizationServiceTest.cs)	(revision 0c9d5a9c08c87f3604ac3b7f7433987382d2a7dc)
@@ -40,37 +40,6 @@
     public class PipingDataSynchronizationServiceTest
     {
         [Test]
-        public void ClearAllCalculationOutput_FailureMechanismNull_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => PipingDataSynchronizationService.ClearAllCalculationOutput(null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(Call);
-            Assert.AreEqual("failureMechanism", exception.ParamName);
-        }
-
-        [Test]
-        public void ClearAllCalculationOutput_WithVariousCalculations_ClearsCalculationsOutputAndReturnsAffectedCalculations()
-        {
-            // Setup
-            PipingFailureMechanism failureMechanism = PipingTestDataGenerator.GetPipingFailureMechanismWithAllCalculationConfigurations();
-            ICalculation[] expectedAffectedCalculations = failureMechanism.Calculations
-                                                                          .Where(c => c.HasOutput)
-                                                                          .ToArray();
-
-            // Call
-            IEnumerable<IObservable> affectedItems = PipingDataSynchronizationService.ClearAllCalculationOutput(failureMechanism);
-
-            // Assert
-            // Note: To make sure the clear is performed regardless of what is done with
-            // the return result, no ToArray() should be called before these assertions:
-            Assert.IsTrue(failureMechanism.Calculations.All(c => !c.HasOutput));
-
-            CollectionAssert.AreEquivalent(expectedAffectedCalculations, affectedItems);
-        }
-
-        [Test]
         public void ClearAllSemiProbabilisticCalculationOutputWithoutManualAssessmentLevel_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Call