Index: Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs
===================================================================
diff -u -r21c1614486e326b3cba28e8e846fc117e5f5c41d -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77
--- Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs	(.../CalculatableFailureMechanismResultObserver.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs	(.../CalculatableFailureMechanismResultObserver.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
@@ -31,13 +31,11 @@
     /// related to its section results.
     /// </summary>
     /// <typeparam name="TFailureMechanism">The type of the failure mechanism to listen to.</typeparam>
-    /// <typeparam name="TSectionResultOld">The type of the failure mechanism section results in the <typeparamref name="TFailureMechanism"/>.</typeparam>
     /// <typeparam name="TSectionResult">The type of the failure mechanism section results in the <typeparamref name="TFailureMechanism"/>.</typeparam>
     /// <typeparam name="TCalculation">The type of the calculations in the <typeparamref name="TFailureMechanism"/>.</typeparam>
-    public class CalculatableFailureMechanismResultObserver<TFailureMechanism, TSectionResultOld, TSectionResult, TCalculation>
-        : FailureMechanismResultObserver<TFailureMechanism, TSectionResultOld, TSectionResult>
-        where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
-        where TSectionResultOld : FailureMechanismSectionResultOld
+    public class CalculatableFailureMechanismResultObserver<TFailureMechanism, TSectionResult, TCalculation>
+        : FailureMechanismResultObserver<TFailureMechanism, TSectionResult>
+        where TFailureMechanism : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
         where TSectionResult : FailureMechanismSectionResult
         where TCalculation : ICalculation<ICalculationInput>
     {
@@ -46,7 +44,7 @@
 
         /// <inheritdoc />
         /// <summary>
-        /// Creates a new instance of <see cref="CalculatableFailureMechanismResultObserver{TFailureMechanism,TSectionResultOld, TSectionResult, TCalculation}"/>.
+        /// Creates a new instance of <see cref="CalculatableFailureMechanismResultObserver{TFailureMechanism,TSectionResult,TCalculation}"/>.
         /// </summary>
         public CalculatableFailureMechanismResultObserver(TFailureMechanism failureMechanism)
             : base(failureMechanism)
Index: Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs
===================================================================
diff -u -r21c1614486e326b3cba28e8e846fc117e5f5c41d -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77
--- Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs	(.../FailureMechanismResultObserver.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs	(.../FailureMechanismResultObserver.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
@@ -30,19 +30,17 @@
     /// its section results.
     /// </summary>
     /// <typeparam name="TFailureMechanism">The type of the failure mechanism to observe.</typeparam>
-    /// <typeparam name="TSectionResultOld">The type of the section results in the failure mechanism.</typeparam>
     /// <typeparam name="TSectionResult">The type of the section results in the failure mechanism.</typeparam>
-    public class FailureMechanismResultObserver<TFailureMechanism, TSectionResultOld, TSectionResult> : Observable, IDisposable
-        where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResultOld, TSectionResult>
-        where TSectionResultOld : FailureMechanismSectionResultOld
+    public class FailureMechanismResultObserver<TFailureMechanism, TSectionResult> : Observable, IDisposable
+        where TFailureMechanism : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
         where TSectionResult : FailureMechanismSectionResult
     {
         private readonly Observer failureMechanismObserver;
         private readonly Observer failureMechanismSectionResultObserver;
         private readonly RecursiveObserver<IObservableEnumerable<TSectionResult>, TSectionResult> failureMechanismSectionResultsObserver;
 
         /// <summary>
-        /// Creates a new instance of <see cref="FailureMechanismResultObserver{TFailureMechanism,TSectionResultOld,TSectionResult}"/>.
+        /// Creates a new instance of <see cref="FailureMechanismResultObserver{TFailureMechanism, TSectionResult}"/>.
         /// </summary>
         /// <param name="failureMechanism">The <typeparamref name="TFailureMechanism"/> to observe.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/CalculatableFailureMechanismResultObserverTest.cs
===================================================================
diff -u -r21c1614486e326b3cba28e8e846fc117e5f5c41d -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/CalculatableFailureMechanismResultObserverTest.cs	(.../CalculatableFailureMechanismResultObserverTest.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/CalculatableFailureMechanismResultObserverTest.cs	(.../CalculatableFailureMechanismResultObserverTest.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
@@ -39,12 +39,11 @@
         {
             // Call
             using (var resultObserver = new CalculatableFailureMechanismResultObserver<TestCalculatableFailureMechanism,
-                FailureMechanismSectionResultOld, FailureMechanismSectionResult,
-                TestCalculationWithInput>(new TestCalculatableFailureMechanism()))
+                FailureMechanismSectionResult, TestCalculationWithInput>(new TestCalculatableFailureMechanism()))
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultObserver<TestCalculatableFailureMechanism,
-                    FailureMechanismSectionResultOld, FailureMechanismSectionResult>>(resultObserver);
+                    FailureMechanismSectionResult>>(resultObserver);
             }
         }
 
@@ -57,7 +56,6 @@
             failureMechanism.CalculationsGroup.Children.Add(calculation);
 
             using (var resultObserver = new CalculatableFailureMechanismResultObserver<TestCalculatableFailureMechanism,
-                FailureMechanismSectionResultOld,
                 FailureMechanismSectionResult,
                 TestCalculationWithInput>(failureMechanism))
             {
@@ -85,7 +83,6 @@
             failureMechanism.CalculationsGroup.Children.Add(calculation);
 
             using (var resultObserver = new CalculatableFailureMechanismResultObserver<TestCalculatableFailureMechanism,
-                FailureMechanismSectionResultOld,
                 FailureMechanismSectionResult,
                 TestCalculationWithInput>(failureMechanism))
             {
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs
===================================================================
diff -u -r21c1614486e326b3cba28e8e846fc117e5f5c41d -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs	(.../FailureMechanismResultObserverTest.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs	(.../FailureMechanismResultObserverTest.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
@@ -37,7 +37,7 @@
         public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(null);
+            TestDelegate test = () => new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -48,7 +48,7 @@
         public void Constructor_WithFailureMechanism_ExpectedProperties()
         {
             // Call
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(new TestFailureMechanism()))
+            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(new TestFailureMechanism()))
             {
                 // Assert
                 Assert.IsInstanceOf<Observable>(resultObserver);
@@ -62,7 +62,7 @@
             // Given
             var failureMechanism = new TestFailureMechanism();
 
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(failureMechanism))
+            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(failureMechanism))
             {
                 var mocks = new MockRepository();
                 var observer = mocks.StrictMock<IObserver>();
@@ -85,7 +85,7 @@
             // Given
             var failureMechanism = new TestFailureMechanism();
 
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(failureMechanism))
+            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(failureMechanism))
             {
                 var mocks = new MockRepository();
                 var observer = mocks.StrictMock<IObserver>();
@@ -112,7 +112,7 @@
                 FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
             });
 
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResultOld, FailureMechanismSectionResult>(failureMechanism))
+            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(failureMechanism))
             {
                 var mocks = new MockRepository();
                 var observer = mocks.StrictMock<IObserver>();
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs
===================================================================
diff -u -r21c1614486e326b3cba28e8e846fc117e5f5c41d -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs	(.../AssessmentSectionResultObserver.cs)	(revision 21c1614486e326b3cba28e8e846fc117e5f5c41d)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Observers/AssessmentSectionResultObserver.cs	(.../AssessmentSectionResultObserver.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
@@ -32,7 +32,6 @@
 using Riskeer.HeightStructures.Data;
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.MacroStabilityInwards.Data;
 using Riskeer.Piping.Data;
 using Riskeer.Piping.Data.SemiProbabilistic;
@@ -93,62 +92,47 @@
             };
 
             closingStructuresObserver = CreateCalculatableFailureMechanismObserver<ClosingStructuresFailureMechanism,
-                ClosingStructuresFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult,
-                StructuresCalculation<ClosingStructuresInput>>(assessmentSection.ClosingStructures);
+                AdoptableFailureMechanismSectionResult, StructuresCalculation<ClosingStructuresInput>>(assessmentSection.ClosingStructures);
 
-            duneErosionObserver = CreateFailureMechanismObserver<DuneErosionFailureMechanism,
-                DuneErosionFailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult>(assessmentSection.DuneErosion);
+            duneErosionObserver = CreateFailureMechanismObserver<DuneErosionFailureMechanism, NonAdoptableFailureMechanismSectionResult>(assessmentSection.DuneErosion);
 
             grassCoverErosionInwardsObserver = CreateCalculatableFailureMechanismObserver<GrassCoverErosionInwardsFailureMechanism,
-                GrassCoverErosionInwardsFailureMechanismSectionResultOld, AdoptableWithProfileProbabilityFailureMechanismSectionResult,
-                GrassCoverErosionInwardsCalculation>(assessmentSection.GrassCoverErosionInwards);
+                AdoptableWithProfileProbabilityFailureMechanismSectionResult, GrassCoverErosionInwardsCalculation>(assessmentSection.GrassCoverErosionInwards);
 
             grassCoverErosionOutwardsObserver = CreateFailureMechanismObserver<GrassCoverErosionOutwardsFailureMechanism,
-                GrassCoverErosionOutwardsFailureMechanismSectionResultOld,
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.GrassCoverErosionOutwards);
 
             heightStructuresObserver = CreateCalculatableFailureMechanismObserver<HeightStructuresFailureMechanism,
-                HeightStructuresFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult,
-                StructuresCalculation<HeightStructuresInput>>(assessmentSection.HeightStructures);
+                AdoptableFailureMechanismSectionResult, StructuresCalculation<HeightStructuresInput>>(assessmentSection.HeightStructures);
 
             macroStabilityInwardsObserver = CreateCalculatableFailureMechanismObserver<MacroStabilityInwardsFailureMechanism,
-                MacroStabilityInwardsFailureMechanismSectionResultOld, AdoptableWithProfileProbabilityFailureMechanismSectionResult,
-                MacroStabilityInwardsCalculationScenario>(assessmentSection.MacroStabilityInwards);
+                AdoptableWithProfileProbabilityFailureMechanismSectionResult, MacroStabilityInwardsCalculationScenario>(assessmentSection.MacroStabilityInwards);
 
             pipingObserver = CreateCalculatableFailureMechanismObserver<PipingFailureMechanism,
-                PipingFailureMechanismSectionResultOld, AdoptableWithProfileProbabilityFailureMechanismSectionResult,
-                SemiProbabilisticPipingCalculationScenario>(assessmentSection.Piping);
+                AdoptableWithProfileProbabilityFailureMechanismSectionResult, SemiProbabilisticPipingCalculationScenario>(assessmentSection.Piping);
 
             stabilityPointStructuresObserver = CreateCalculatableFailureMechanismObserver<StabilityPointStructuresFailureMechanism,
-                StabilityPointStructuresFailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult,
-                StructuresCalculation<StabilityPointStructuresInput>>(assessmentSection.StabilityPointStructures);
+                AdoptableFailureMechanismSectionResult, StructuresCalculation<StabilityPointStructuresInput>>(assessmentSection.StabilityPointStructures);
 
             stabilityStoneCoverObserver = CreateFailureMechanismObserver<StabilityStoneCoverFailureMechanism,
-                StabilityStoneCoverFailureMechanismSectionResultOld,
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.StabilityStoneCover);
 
             waveImpactAsphaltCoverObserver = CreateFailureMechanismObserver<WaveImpactAsphaltCoverFailureMechanism,
-                WaveImpactAsphaltCoverFailureMechanismSectionResultOld,
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.WaveImpactAsphaltCover);
 
             grassCoverSlipOffInwardsObserver = CreateFailureMechanismObserver<GrassCoverSlipOffInwardsFailureMechanism,
-                GrassCoverSlipOffInwardsFailureMechanismSectionResultOld,
                 NonAdoptableFailureMechanismSectionResult>(assessmentSection.GrassCoverSlipOffInwards);
 
             grassCoverSlipOffOutwardsObserver = CreateFailureMechanismObserver<GrassCoverSlipOffOutwardsFailureMechanism,
-                GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld,
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.GrassCoverSlipOffOutwards);
 
             microstabilityObserver = CreateFailureMechanismObserver<MicrostabilityFailureMechanism,
-                MicrostabilityFailureMechanismSectionResultOld,
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.Microstability);
 
             pipingStructureObserver = CreateFailureMechanismObserver<PipingStructureFailureMechanism,
-                PipingStructureFailureMechanismSectionResultOld,
                 NonAdoptableFailureMechanismSectionResult>(assessmentSection.PipingStructure);
 
             waterPressureAsphaltCoverObserver = CreateFailureMechanismObserver<WaterPressureAsphaltCoverFailureMechanism,
-                WaterPressureAsphaltCoverFailureMechanismSectionResultOld,
                 NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(assessmentSection.WaterPressureAsphaltCover);
         }
 
@@ -203,28 +187,25 @@
             waterPressureAsphaltCoverObserver.Observable = assessmentSection.WaterPressureAsphaltCover;
         }
 
-        private Observer CreateCalculatableFailureMechanismObserver<TFailureMechanism, TSectionResultOld, TSectionResult, TCalculation>(TFailureMechanism failureMechanism)
-            where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
-            where TSectionResultOld : FailureMechanismSectionResultOld
+        private Observer CreateCalculatableFailureMechanismObserver<TFailureMechanism, TSectionResult, TCalculation>(TFailureMechanism failureMechanism)
+            where TFailureMechanism : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
             where TSectionResult : FailureMechanismSectionResult
             where TCalculation : ICalculation<ICalculationInput>
         {
             return new Observer(NotifyObservers)
             {
                 Observable = new CalculatableFailureMechanismResultObserver<TFailureMechanism,
-                    TSectionResultOld, TSectionResult, TCalculation>(failureMechanism)
+                    TSectionResult, TCalculation>(failureMechanism)
             };
         }
 
-        private Observer CreateFailureMechanismObserver<TFailureMechanism, TSectionResultOld, TSectionResult>(TFailureMechanism failureMechanism)
-            where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResultOld, TSectionResult>
-            where TSectionResultOld : FailureMechanismSectionResultOld
+        private Observer CreateFailureMechanismObserver<TFailureMechanism, TSectionResult>(TFailureMechanism failureMechanism)
+            where TFailureMechanism : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
             where TSectionResult : FailureMechanismSectionResult
         {
             return new Observer(NotifyObservers)
             {
-                Observable = new FailureMechanismResultObserver<TFailureMechanism,
-                    TSectionResultOld, TSectionResult>(failureMechanism)
+                Observable = new FailureMechanismResultObserver<TFailureMechanism, TSectionResult>(failureMechanism)
             };
         }
     }