Index: Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationActivity.cs
===================================================================
diff -u -r11e5b00b0252e6bf58813a42ea275c404f5e3c95 -r401b0c5f2f0424e545fc7b1a71d7e2862a895e5a
--- Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 11e5b00b0252e6bf58813a42ea275c404f5e3c95)
+++ Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 401b0c5f2f0424e545fc7b1a71d7e2862a895e5a)
@@ -72,7 +72,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculationSettings, targetProbability);
+            return calculationService.Validate(calculationSettings);
         }
 
         protected override void PerformCalculation()
Index: Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -rf77a46717fb97e9edff3f4392b02168e6e96475c -r401b0c5f2f0424e545fc7b1a71d7e2862a895e5a
--- Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision f77a46717fb97e9edff3f4392b02168e6e96475c)
+++ Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 401b0c5f2f0424e545fc7b1a71d7e2862a895e5a)
@@ -71,7 +71,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculationSettings, targetProbability);
+            return calculationService.Validate(calculationSettings);
         }
 
         protected override void PerformCalculation()
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r401b0c5f2f0424e545fc7b1a71d7e2862a895e5a
--- Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs	(.../TargetProbabilityCalculationServiceTest.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs	(.../TargetProbabilityCalculationServiceTest.cs)	(revision 401b0c5f2f0424e545fc7b1a71d7e2862a895e5a)
@@ -32,7 +32,6 @@
     [TestFixture]
     public class TargetProbabilityCalculationServiceTest
     {
-        private const double validTargetProbability = 0.005;
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation");
         private static readonly string validHydraulicBoundaryDatabaseFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
         private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite");
@@ -43,24 +42,24 @@
         public void Validate_CalculationSettingsNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => calculationService.Validate(null, validTargetProbability);
+            void Call() => calculationService.Validate(null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("calculationSettings", exception.ParamName);
         }
 
         [Test]
-        public void Validate_ValidParameters_ReturnsTrue()
+        public void Validate_WithCalculationSettings_ReturnsTrue()
         {
             // Setup
             var valid = false;
 
             // Call
-            Action call = () => valid = calculationService.Validate(CreateValidCalculationSettings(), validTargetProbability);
+            void Call() => valid = calculationService.Validate(CreateValidCalculationSettings());
 
             // Assert
-            TestHelper.AssertLogMessages(call, messages =>
+            TestHelper.AssertLogMessages(Call, messages =>
             {
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(2, msgs.Length);
@@ -82,10 +81,10 @@
             var valid = true;
 
             // Call
-            Action call = () => valid = calculationService.Validate(calculationSettings, validTargetProbability);
+            void Call() => valid = calculationService.Validate(calculationSettings);
 
             // Assert
-            TestHelper.AssertLogMessages(call, messages =>
+            TestHelper.AssertLogMessages(Call, messages =>
             {
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
@@ -108,10 +107,10 @@
                                                                                string.Empty);
 
             // Call
-            Action call = () => valid = calculationService.Validate(calculationSettings, validTargetProbability);
+            void Call() => valid = calculationService.Validate(calculationSettings);
 
             // Assert
-            TestHelper.AssertLogMessages(call, messages =>
+            TestHelper.AssertLogMessages(Call, messages =>
             {
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
@@ -134,10 +133,10 @@
                                                                                invalidPreprocessorDirectory);
 
             // Call
-            Action call = () => valid = calculationService.Validate(calculationSettings, validTargetProbability);
+            void Call() => valid = calculationService.Validate(calculationSettings);
 
             // Assert
-            TestHelper.AssertLogMessages(call, messages =>
+            TestHelper.AssertLogMessages(Call, messages =>
             {
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
@@ -159,10 +158,10 @@
                                                                                string.Empty);
 
             // Call
-            Action call = () => valid = calculationService.Validate(calculationSettings, validTargetProbability);
+            void Call() => valid = calculationService.Validate(calculationSettings);
 
             // Assert
-            TestHelper.AssertLogMessages(call, messages =>
+            TestHelper.AssertLogMessages(Call, messages =>
             {
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
@@ -173,69 +172,6 @@
             Assert.IsFalse(valid);
         }
 
-        [Test]
-        public void Validate_TargetProbabilityInvalid_LogsErrorAndReturnsFalse()
-        {
-            // Setup
-            var valid = true;
-
-            // Call
-            Action call = () => valid = calculationService.Validate(CreateValidCalculationSettings(), double.NaN);
-
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
-            {
-                string[] msgs = messages.ToArray();
-                Assert.AreEqual(3, msgs.Length);
-                CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                Assert.AreEqual("Kon geen doelkans bepalen voor deze berekening.", msgs[1]);
-                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
-            });
-            Assert.IsFalse(valid);
-        }
-
-        [Test]
-        public void Validate_TargetProbabilityInvalidTooBig_LogsErrorAndReturnsFalse()
-        {
-            // Setup
-            var valid = true;
-
-            // Call
-            Action call = () => valid = calculationService.Validate(CreateValidCalculationSettings(), 1.0);
-
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
-            {
-                string[] msgs = messages.ToArray();
-                Assert.AreEqual(3, msgs.Length);
-                CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                Assert.AreEqual("Doelkans is te groot om een berekening uit te kunnen voeren.", msgs[1]);
-                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
-            });
-            Assert.IsFalse(valid);
-        }
-
-        [Test]
-        public void Validate_TargetProbabilityInvalidTooSmall_LogsErrorAndReturnsFalse()
-        {
-            // Setup
-            var valid = true;
-
-            // Call
-            Action call = () => valid = calculationService.Validate(CreateValidCalculationSettings(), 0.0);
-
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
-            {
-                string[] msgs = messages.ToArray();
-                Assert.AreEqual(3, msgs.Length);
-                CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                Assert.AreEqual("Doelkans is te klein om een berekening uit te kunnen voeren.", msgs[1]);
-                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
-            });
-            Assert.IsFalse(valid);
-        }
-
         private static HydraulicBoundaryCalculationSettings CreateValidCalculationSettings()
         {
             return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationActivity.cs
===================================================================
diff -u -r01594ac7a38dac4d0d9c45c4778affd651e01781 -r401b0c5f2f0424e545fc7b1a71d7e2862a895e5a
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationActivity.cs	(.../DuneLocationCalculationActivity.cs)	(revision 01594ac7a38dac4d0d9c45c4778affd651e01781)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationActivity.cs	(.../DuneLocationCalculationActivity.cs)	(revision 401b0c5f2f0424e545fc7b1a71d7e2862a895e5a)
@@ -75,7 +75,7 @@
 
         protected override bool Validate()
         {
-            return calculationService.Validate(calculationSettings, targetProbability);
+            return calculationService.Validate(calculationSettings);
         }
 
         protected override void PerformCalculation()