Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs
===================================================================
diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r94a8faf16d9871c71e343cf4bb5e68531459fb20
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision 94a8faf16d9871c71e343cf4bb5e68531459fb20)
@@ -32,8 +32,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{T}"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class ClosingStructuresCalculationContext : FailureMechanismItemContextBase<StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>,
-                                                       ICalculationContext<StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>
+    public class ClosingStructuresCalculationContext : StructuresCalculationContext<ClosingStructuresInput, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresCalculationContext"/>.
@@ -47,16 +46,6 @@
                                                    CalculationGroup parent,
                                                    ClosingStructuresFailureMechanism failureMechanism,
                                                    IAssessmentSection assessmentSection)
-            : base(wrappedData, failureMechanism, assessmentSection)
-        {
-            if (parent == null)
-            {
-                throw new ArgumentNullException(nameof(parent));
-            }
-
-            Parent = parent;
-        }
-
-        public CalculationGroup Parent { get; }
+            : base(wrappedData, parent, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs
===================================================================
diff -u -r66a3c8b86b4ada9239a31cfc47e6c1979c11e000 -r94a8faf16d9871c71e343cf4bb5e68531459fb20
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs	(.../ClosingStructuresCalculationContextTest.cs)	(revision 66a3c8b86b4ada9239a31cfc47e6c1979c11e000)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs	(.../ClosingStructuresCalculationContextTest.cs)	(revision 94a8faf16d9871c71e343cf4bb5e68531459fb20)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
@@ -50,33 +49,12 @@
             var context = new ClosingStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismItemContextBase<StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>>(context);
-            Assert.IsInstanceOf<ICalculationContext<StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<StructuresCalculationContext<ClosingStructuresInput, ClosingStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation, context.WrappedData);
             Assert.AreSame(parent, context.Parent);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             mocksRepository.VerifyAll();
         }
-
-        [Test]
-        public void ParameteredConstructor_ParentNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            var calculation = new StructuresCalculation<ClosingStructuresInput>();
-            var failureMechanism = new ClosingStructuresFailureMechanism();
-
-            // Call
-            TestDelegate call = () => new ClosingStructuresCalculationContext(calculation, null, failureMechanism, assessmentSection);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("parent", exception.ParamName);
-            mockRepository.VerifyAll();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs
===================================================================
diff -u -r66a3c8b86b4ada9239a31cfc47e6c1979c11e000 -r94a8faf16d9871c71e343cf4bb5e68531459fb20
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision 66a3c8b86b4ada9239a31cfc47e6c1979c11e000)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision 94a8faf16d9871c71e343cf4bb5e68531459fb20)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -50,33 +49,12 @@
             var context = new HeightStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismItemContextBase<StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>>(context);
-            Assert.IsInstanceOf<ICalculationContext<StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<StructuresCalculationContext<HeightStructuresInput, HeightStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation, context.WrappedData);
             Assert.AreSame(parent, context.Parent);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             mocksRepository.VerifyAll();
         }
-
-        [Test]
-        public void ParameteredConstructor_ParentNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            var calculation = new StructuresCalculation<HeightStructuresInput>();
-            var failureMechanism = new HeightStructuresFailureMechanism();
-
-            // Call
-            TestDelegate call = () => new HeightStructuresCalculationContext(calculation, null, failureMechanism, assessmentSection);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("parent", exception.ParamName);
-            mockRepository.VerifyAll();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs
===================================================================
diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r94a8faf16d9871c71e343cf4bb5e68531459fb20
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision 94a8faf16d9871c71e343cf4bb5e68531459fb20)
@@ -32,8 +32,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{T}"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class StabilityPointStructuresCalculationContext : FailureMechanismItemContextBase<StructuresCalculation<StabilityPointStructuresInput>, StabilityPointStructuresFailureMechanism>,
-                                                              ICalculationContext<StructuresCalculation<StabilityPointStructuresInput>, StabilityPointStructuresFailureMechanism>
+    public class StabilityPointStructuresCalculationContext : StructuresCalculationContext<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresCalculationContext"/>.
@@ -47,16 +46,6 @@
                                                           CalculationGroup parent,
                                                           StabilityPointStructuresFailureMechanism failureMechanism,
                                                           IAssessmentSection assessmentSection)
-            : base(calculation, failureMechanism, assessmentSection)
-        {
-            if (parent == null)
-            {
-                throw new ArgumentNullException(nameof(parent));
-            }
-
-            Parent = parent;
-        }
-
-        public CalculationGroup Parent { get; }
+            : base(calculation, parent, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs
===================================================================
diff -u -r66a3c8b86b4ada9239a31cfc47e6c1979c11e000 -r94a8faf16d9871c71e343cf4bb5e68531459fb20
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(.../StabilityPointStructuresCalculationContextTest.cs)	(revision 66a3c8b86b4ada9239a31cfc47e6c1979c11e000)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(.../StabilityPointStructuresCalculationContextTest.cs)	(revision 94a8faf16d9871c71e343cf4bb5e68531459fb20)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -50,33 +49,12 @@
             var context = new StabilityPointStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismItemContextBase<StructuresCalculation<StabilityPointStructuresInput>, StabilityPointStructuresFailureMechanism>>(context);
-            Assert.IsInstanceOf<ICalculationContext<StructuresCalculation<StabilityPointStructuresInput>, StabilityPointStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<StructuresCalculationContext<StabilityPointStructuresInput, StabilityPointStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation, context.WrappedData);
             Assert.AreSame(parent, context.Parent);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             mocksRepository.VerifyAll();
         }
-
-        [Test]
-        public void ParameteredConstructor_ParentNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
-            var failureMechanism = new StabilityPointStructuresFailureMechanism();
-
-            // Call
-            TestDelegate call = () => new StabilityPointStructuresCalculationContext(calculation, null, failureMechanism, assessmentSection);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("parent", exception.ParamName);
-            mockRepository.VerifyAll();
-        }
     }
 }
\ No newline at end of file