Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs
===================================================================
diff -u -raf512699accf113b63e9fa871ff27ce539c2f508 -rb5b3e06b1d193ca35b0f17e580a49f31bb282939
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs	(.../MacroStabilityInwardsDataSynchronizationService.cs)	(revision af512699accf113b63e9fa871ff27ce539c2f508)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs	(.../MacroStabilityInwardsDataSynchronizationService.cs)	(revision b5b3e06b1d193ca35b0f17e580a49f31bb282939)
@@ -72,7 +72,7 @@
             }
 
             return failureMechanism.Calculations
-                                   .OfType<MacroStabilityInwardsCalculationScenario>()
+                                   .Cast<MacroStabilityInwardsCalculationScenario>()
                                    .Where(c => !c.InputParameters.UseAssessmentLevelManualInput)
                                    .SelectMany(ClearCalculationOutput)
                                    .ToArray();
@@ -104,7 +104,12 @@
         }
 
         /// <summary>
-        /// Clears the <see cref="HydraulicBoundaryLocation"/> and output for all the calculations in the <see cref="MacroStabilityInwardsFailureMechanism"/>.
+        /// Clears:
+        /// <list type="bullet">
+        /// <item>The <see cref="HydraulicBoundaryLocation"/> for all the calculations in the <see cref="MacroStabilityInwardsFailureMechanism"/>;</item>
+        /// <item>The output for all the calculations in the <see cref="MacroStabilityInwardsFailureMechanism"/>,
+        /// except where <see cref="MacroStabilityInwardsInput.UseAssessmentLevelManualInput"/> is <c>true</c>.</item>
+        /// </list>
         /// </summary>
         /// <param name="failureMechanism">The <see cref="MacroStabilityInwardsFailureMechanism"/> which contains the calculations.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> of objects which are affected by removing data.</returns>
@@ -119,7 +124,7 @@
             var affectedItems = new List<IObservable>();
             foreach (MacroStabilityInwardsCalculation calculation in failureMechanism.Calculations.Cast<MacroStabilityInwardsCalculation>())
             {
-                affectedItems.AddRange(ClearCalculationOutput(calculation)
+                affectedItems.AddRange(ClearAllCalculationOutputWithoutManualAssessmentLevel(failureMechanism)
                                            .Concat(ClearHydraulicBoundaryLocation(calculation.InputParameters)));
             }
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -raf512699accf113b63e9fa871ff27ce539c2f508 -rb5b3e06b1d193ca35b0f17e580a49f31bb282939
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs	(.../MacroStabilityInwardsDataSynchronizationServiceTest.cs)	(revision af512699accf113b63e9fa871ff27ce539c2f508)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs	(.../MacroStabilityInwardsDataSynchronizationServiceTest.cs)	(revision b5b3e06b1d193ca35b0f17e580a49f31bb282939)
@@ -183,28 +183,36 @@
         {
             // Setup
             MacroStabilityInwardsFailureMechanism failureMechanism = MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsFailureMechanismWithAllCalculationConfigurations();
-            MacroStabilityInwardsCalculation[] calculations = failureMechanism.Calculations.Cast<MacroStabilityInwardsCalculation>().ToArray();
-            IObservable[] expectedAffectedCalculations = calculations.Where(c => c.HasOutput)
-                                                                     .Cast<IObservable>()
-                                                                     .ToArray();
-            IObservable[] expectedAffectedCalculationInputs = calculations.Select(c => c.InputParameters)
-                                                                          .Where(i => i.HydraulicBoundaryLocation != null)
-                                                                          .Cast<IObservable>()
-                                                                          .ToArray();
+            failureMechanism.CalculationsGroup.Children.Add(new MacroStabilityInwardsCalculationScenario
+            {
+                InputParameters =
+                {
+                    UseAssessmentLevelManualInput = true
+                },
+                Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
+            });
 
+            MacroStabilityInwardsCalculation[] calculations = failureMechanism.Calculations
+                                                                              .Cast<MacroStabilityInwardsCalculation>()
+                                                                              .ToArray();
+
+            var expectedAffectedItems = new List<IObservable>();
+            expectedAffectedItems.AddRange(calculations.Where(c => !c.InputParameters.UseAssessmentLevelManualInput
+                                                                   && c.HasOutput));
+            expectedAffectedItems.AddRange(calculations.Select(c => c.InputParameters)
+                                                       .Where(i => i.HydraulicBoundaryLocation != null));
+
             // Call
             IEnumerable<IObservable> affectedItems = MacroStabilityInwardsDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(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
-                                          .Cast<MacroStabilityInwardsCalculation>()
-                                          .All(c => c.InputParameters.HydraulicBoundaryLocation == null
-                                                    && !c.HasOutput));
+            Assert.IsTrue(calculations.Where(c => !c.InputParameters.UseAssessmentLevelManualInput)
+                                      .All(c => c.InputParameters.HydraulicBoundaryLocation == null
+                                                && !c.HasOutput));
 
-            CollectionAssert.AreEquivalent(expectedAffectedCalculations.Concat(expectedAffectedCalculationInputs),
-                                           affectedItems);
+            CollectionAssert.AreEquivalent(expectedAffectedItems, affectedItems);
         }
 
         [Test]