Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r73114a1d1b9584c215af6cf47aa309d80cda16a4 -r21fc62066ce67ae24c5df4502b5026b302d90036
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 73114a1d1b9584c215af6cf47aa309d80cda16a4)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 21fc62066ce67ae24c5df4502b5026b302d90036)
@@ -34,7 +34,6 @@
     internal class StabilityStoneCoverWaveConditionsCalculationActivity : CalculatableActivity
     {
         private readonly StabilityStoneCoverWaveConditionsCalculation calculation;
-        private readonly string hlcdFilePath;
         private readonly StabilityStoneCoverFailureMechanism failureMechanism;
         private readonly IAssessmentSection assessmentSection;
         private readonly StabilityStoneCoverWaveConditionsCalculationService calculationService;
@@ -43,21 +42,14 @@
         /// Creates a new instance of <see cref="StabilityStoneCoverWaveConditionsCalculationActivity"/>.
         /// </summary>
         /// <param name="calculation">The stability stone cover wave conditions data used for the calculation.</param>
-        /// <param name="hlcdFilePath">The directory of the HLCD file that should be used for performing the calculation.</param>
         /// <param name="failureMechanism">The failure mechanism the calculation belongs to.</param>
         /// <param name="assessmentSection">The assessment section the calculation belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsCalculationActivity(StabilityStoneCoverWaveConditionsCalculation calculation,
-                                                                    string hlcdFilePath,
                                                                     StabilityStoneCoverFailureMechanism failureMechanism,
                                                                     IAssessmentSection assessmentSection)
             : base(calculation)
         {
-            if (hlcdFilePath == null)
-            {
-                throw new ArgumentNullException(nameof(hlcdFilePath));
-            }
-
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException(nameof(failureMechanism));
@@ -69,7 +61,6 @@
             }
 
             this.calculation = calculation;
-            this.hlcdFilePath = hlcdFilePath;
             this.failureMechanism = failureMechanism;
             this.assessmentSection = assessmentSection;
 
@@ -83,7 +74,7 @@
             return StabilityStoneCoverWaveConditionsCalculationService.Validate(calculation,
                                                                                 assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation,
                                                                                                                      calculation.InputParameters.CategoryType),
-                                                                                hlcdFilePath,
+                                                                                assessmentSection.HydraulicBoundaryDatabase.FilePath,
                                                                                 assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
                                                                                 assessmentSection.GetNorm(calculation.InputParameters.CategoryType));
         }
@@ -94,7 +85,7 @@
 
             StabilityStoneCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
             calculationService.Calculate(
-                calculation, assessmentSection, failureMechanism.GeneralInput, hlcdFilePath);
+                calculation, assessmentSection, failureMechanism.GeneralInput, assessmentSection.HydraulicBoundaryDatabase.FilePath);
         }
 
         protected override void OnFinish()
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivityFactory.cs
===================================================================
diff -u -r3af700006b3a91867ab1a9bb3526ff6715561847 -r21fc62066ce67ae24c5df4502b5026b302d90036
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivityFactory.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityFactory.cs)	(revision 3af700006b3a91867ab1a9bb3526ff6715561847)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivityFactory.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityFactory.cs)	(revision 21fc62066ce67ae24c5df4502b5026b302d90036)
@@ -124,7 +124,6 @@
             }
 
             return new StabilityStoneCoverWaveConditionsCalculationActivity(calculation,
-                                                                            assessmentSection.HydraulicBoundaryDatabase.FilePath,
                                                                             failureMechanism,
                                                                             assessmentSection);
         }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityTest.cs
===================================================================
diff -u -ra494bde768f1b989d31bff6a801a1816d6f9692e -r21fc62066ce67ae24c5df4502b5026b302d90036
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityTest.cs)	(revision a494bde768f1b989d31bff6a801a1816d6f9692e)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityTest.cs)	(revision 21fc62066ce67ae24c5df4502b5026b302d90036)
@@ -44,7 +44,7 @@
             var calculation = new StabilityStoneCoverWaveConditionsCalculation();
 
             // Call
-            var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, string.Empty, failureMechanism, assessmentSection);
+            var activity = new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, failureMechanism, assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<CalculatableActivity>(activity);
@@ -56,26 +56,6 @@
         }
 
         [Test]
-        public void Constructor_HlcdDirectoryNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            var calculation = new StabilityStoneCoverWaveConditionsCalculation();
-
-            // Call
-            TestDelegate call = () => new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, null, failureMechanism, assessmentSection);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("hlcdFilePath", exception.ParamName);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
@@ -86,7 +66,7 @@
             var calculation = new StabilityStoneCoverWaveConditionsCalculation();
 
             // Call
-            TestDelegate call = () => new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, "", null, assessmentSection);
+            TestDelegate call = () => new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, null, assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -102,7 +82,7 @@
             var calculation = new StabilityStoneCoverWaveConditionsCalculation();
 
             // Call
-            TestDelegate call = () => new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, "", failureMechanism, null);
+            TestDelegate call = () => new StabilityStoneCoverWaveConditionsCalculationActivity(calculation, failureMechanism, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);