Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -54,8 +54,6 @@
             ForeshoreProfiles = new ForeshoreProfileCollection();
         }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<ClosingStructuresInput>>();
-
         /// <summary>
         /// Gets the general closing structures calculation input parameters that apply to each calculation.
         /// </summary>
@@ -71,6 +69,8 @@
         /// </summary>
         public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<ClosingStructuresInput>>();
+
         public CalculationGroup CalculationsGroup { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs
===================================================================
diff -u -rd567f88de093bf2ebe8e26f7402a6c6a2f3e89aa -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs	(.../FailureMechanismBase.cs)	(revision d567f88de093bf2ebe8e26f7402a6c6a2f3e89aa)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs	(.../FailureMechanismBase.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Base;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailurePath;
 
 namespace Riskeer.Common.Data.FailureMechanism
@@ -72,8 +71,6 @@
 
         public string Code { get; }
 
-        public abstract IEnumerable<ICalculation> Calculations { get; }
-
         public Comment CalculationsInputComments { get; }
 
         public IEnumerable<FailureMechanismSection> Sections => sectionCollection;
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs
===================================================================
diff -u -r5e8b21352cfe76480799a139f21d2ef3c1b58ec7 -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs	(.../FailureMechanismBaseTest.cs)	(revision 5e8b21352cfe76480799a139f21d2ef3c1b58ec7)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismBaseTest.cs	(.../FailureMechanismBaseTest.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -20,13 +20,11 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 
 namespace Riskeer.Common.Data.Test.FailureMechanism
@@ -292,8 +290,6 @@
             public SimpleFailureMechanismBase(string name = "SomeName",
                                               string failureMechanismCode = "SomeCode")
                 : base(name, failureMechanismCode) {}
-
-            public override IEnumerable<ICalculation> Calculations => throw new NotImplementedException();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs
===================================================================
diff -u -r06a1e601c966c70377fad8abbe0d8d1efbdd2594 -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs	(.../TestFailureMechanism.cs)	(revision 06a1e601c966c70377fad8abbe0d8d1efbdd2594)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailureMechanism.cs	(.../TestFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -73,10 +73,10 @@
 
         public CalculationGroup CalculationsGroup { get; }
 
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
+
         public GeneralInput GeneralInput { get; }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
-
         protected override void AddSectionDependentData(FailureMechanismSection section)
         {
             ((ObservableList<TestFailureMechanismSectionResult>) SectionResults).Add(new TestFailureMechanismSectionResult(section));
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs
===================================================================
diff -u -r9aaabd7e325d5951d0d84713754373a90b47738c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs	(.../NonAdoptableFailureMechanismResultViewTest.cs)	(revision 9aaabd7e325d5951d0d84713754373a90b47738c)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs	(.../NonAdoptableFailureMechanismResultViewTest.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -20,14 +20,12 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.Views;
@@ -197,8 +195,6 @@
         private class TestNonAdoptableFailureMechanism : FailureMechanismBase<NonAdoptableFailureMechanismSectionResult>
         {
             public TestNonAdoptableFailureMechanism() : base("Test", "T") {}
-
-            public override IEnumerable<ICalculation> Calculations { get; }
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs
===================================================================
diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs)	(revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using NUnit.Extensions.Forms;
@@ -30,7 +29,6 @@
 using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.Views;
@@ -125,8 +123,8 @@
 
             // Call
             using (var view = new NonAdoptableWithProfileProbabilityFailureMechanismResultView<TestNonAdoptableWithProfileProbabilityFailureMechanism>(
-                failureMechanism.SectionResults, failureMechanism, assessmentSection,
-                (fm, ass) => double.NaN, fm => false, performFailureMechanismSectionAssemblyFunc))
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection,
+                       (fm, ass) => double.NaN, fm => false, performFailureMechanismSectionAssemblyFunc))
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult,
@@ -346,8 +344,6 @@
         {
             public TestNonAdoptableWithProfileProbabilityFailureMechanism() : base("Test", "T") {}
 
-            public override IEnumerable<ICalculation> Calculations { get; }
-
             public bool UseLengthEffect { get; set; }
         }
     }
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r9aaabd7e325d5951d0d84713754373a90b47738c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs	(.../StructuresFailureMechanismResultViewTest.cs)	(revision 9aaabd7e325d5951d0d84713754373a90b47738c)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs	(.../StructuresFailureMechanismResultViewTest.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -365,7 +365,7 @@
                 CalculationsGroup = new CalculationGroup();
             }
 
-            public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
+            public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
 
             public CalculationGroup CalculationsGroup { get; }
         }
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs	(.../DuneErosionFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs	(.../DuneErosionFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.DuneErosion.Data.Properties;
 
@@ -47,14 +46,6 @@
             DuneLocationCalculationsForUserDefinedTargetProbabilities = new ObservableList<DuneLocationCalculationsForTargetProbability>();
         }
 
-        public override IEnumerable<ICalculation> Calculations
-        {
-            get
-            {
-                yield break;
-            }
-        }
-
         /// <summary>
         /// Gets the general dune erosion calculation input parameters that apply to each calculation.
         /// </summary>
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs	(.../GrassCoverErosionInwardsFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs	(.../GrassCoverErosionInwardsFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -49,8 +49,6 @@
             DikeProfiles = new DikeProfileCollection();
         }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<GrassCoverErosionInwardsCalculation>();
-
         /// <summary>
         /// Gets the general grass cover erosion inwards calculation input parameters that apply to each calculation.
         /// </summary>
@@ -61,6 +59,8 @@
         /// </summary>
         public DikeProfileCollection DikeProfiles { get; }
 
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<GrassCoverErosionInwardsCalculation>();
+
         public CalculationGroup CalculationsGroup { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs
===================================================================
diff -u -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11 -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -60,7 +60,7 @@
         /// </summary>
         public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<GrassCoverErosionOutwardsWaveConditionsCalculation>();
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<GrassCoverErosionOutwardsWaveConditionsCalculation>();
 
         public CalculationGroup CalculationsGroup { get; }
     }
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -52,8 +52,6 @@
             ForeshoreProfiles = new ForeshoreProfileCollection();
         }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<HeightStructuresInput>>();
-
         /// <summary>
         /// Gets the height structures calculation input parameters that apply to each calculation.
         /// </summary>
@@ -69,6 +67,8 @@
         /// </summary>
         public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<HeightStructuresInput>>();
+
         /// <summary>
         /// Gets the container of all calculations.
         /// </summary>
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs	(.../GrassCoverSlipOffInwardsFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs	(.../GrassCoverSlipOffInwardsFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.Properties;
 
@@ -43,13 +41,5 @@
         }
 
         public GeneralInput GeneralInput { get; }
-
-        public override IEnumerable<ICalculation> Calculations
-        {
-            get
-            {
-                yield break;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs	(.../GrassCoverSlipOffOutwardsFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs	(.../GrassCoverSlipOffOutwardsFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.Properties;
 
@@ -43,13 +41,5 @@
         }
 
         public GeneralInput GeneralInput { get; }
-
-        public override IEnumerable<ICalculation> Calculations
-        {
-            get
-            {
-                yield break;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs	(.../MicrostabilityFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs	(.../MicrostabilityFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.Properties;
 
@@ -43,13 +41,5 @@
         }
 
         public GeneralInput GeneralInput { get; }
-
-        public override IEnumerable<ICalculation> Calculations
-        {
-            get
-            {
-                yield break;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs	(.../PipingStructureFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs	(.../PipingStructureFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.Properties;
 using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources;
@@ -46,13 +44,5 @@
         }
 
         public GeneralInput GeneralInput { get; }
-
-        public override IEnumerable<ICalculation> Calculations
-        {
-            get
-            {
-                yield break;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs	(.../WaterPressureAsphaltCoverFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs	(.../WaterPressureAsphaltCoverFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Collections.Generic;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Integration.Data.Properties;
 
@@ -43,13 +41,5 @@
         }
 
         public GeneralInput GeneralInput { get; }
-
-        public override IEnumerable<ICalculation> Calculations
-        {
-            get
-            {
-                yield break;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rf8f2889dba19c92d85de99a988ad12d968c59ec2 -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs	(.../FailureMechanismAssemblyFactoryTest.cs)	(revision f8f2889dba19c92d85de99a988ad12d968c59ec2)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/FailureMechanismAssemblyFactoryTest.cs	(.../FailureMechanismAssemblyFactoryTest.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -31,7 +30,6 @@
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.Contribution;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
@@ -53,8 +51,6 @@
                 GeneralInput = new GeneralInput();
             }
 
-            public override IEnumerable<ICalculation> Calculations { get; }
-
             public GeneralInput GeneralInput { get; }
         }
 
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs	(.../MacroStabilityInwardsFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs	(.../MacroStabilityInwardsFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -50,8 +50,6 @@
             };
         }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
-
         /// <summary>
         /// Gets the available surface lines within the scope of the macro stability inwards failure mechanism.
         /// </summary>
@@ -73,6 +71,8 @@
         /// </summary>
         public MacroStabilityInwardsProbabilityAssessmentInput MacroStabilityInwardsProbabilityAssessmentInput { get; }
 
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
+
         public CalculationGroup CalculationsGroup { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -55,8 +55,6 @@
             scenarioConfigurationsPerFailureMechanismSection = new ObservableList<PipingScenarioConfigurationPerFailureMechanismSection>();
         }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
-
         /// <summary>
         /// Gets the available surface lines within the scope of the piping failure mechanism.
         /// </summary>
@@ -89,6 +87,8 @@
         public IObservableEnumerable<PipingScenarioConfigurationPerFailureMechanismSection> ScenarioConfigurationsPerFailureMechanismSection =>
             scenarioConfigurationsPerFailureMechanismSection;
 
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
+
         public CalculationGroup CalculationsGroup { get; }
 
         protected override void AddSectionDependentData(FailureMechanismSection section)
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -53,8 +53,6 @@
             ForeshoreProfiles = new ForeshoreProfileCollection();
         }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<StabilityPointStructuresInput>>();
-
         /// <summary>
         /// Gets the general stability point structures calculation input parameters that apply to each calculation.
         /// </summary>
@@ -70,6 +68,8 @@
         /// </summary>
         public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().Cast<StructuresCalculation<StabilityPointStructuresInput>>();
+
         public CalculationGroup CalculationsGroup { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs
===================================================================
diff -u -rce73d815b0583615c74550ba004fd553202b43fe -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs	(.../StabilityStoneCoverFailureMechanism.cs)	(revision ce73d815b0583615c74550ba004fd553202b43fe)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs	(.../StabilityStoneCoverFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -60,7 +60,7 @@
         /// </summary>
         public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<StabilityStoneCoverWaveConditionsCalculation>();
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<StabilityStoneCoverWaveConditionsCalculation>();
 
         public CalculationGroup CalculationsGroup { get; }
     }
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs
===================================================================
diff -u -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 -r2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs	(.../WaveImpactAsphaltCoverFailureMechanism.cs)	(revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs	(.../WaveImpactAsphaltCoverFailureMechanism.cs)	(revision 2fd0e9b83ef2cc7fa69ded6b619bc9e5b06d08f2)
@@ -67,8 +67,8 @@
         /// </summary>
         public GeneralWaveImpactAsphaltCoverInput GeneralWaveImpactAsphaltCoverInput { get; }
 
-        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<WaveImpactAsphaltCoverWaveConditionsCalculation>();
-        
+        public IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<WaveImpactAsphaltCoverWaveConditionsCalculation>();
+
         public CalculationGroup CalculationsGroup { get; }
     }
 }
\ No newline at end of file