Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs
===================================================================
diff -u -r150c8a50ff20b4056c1ad7a5ef12ef9f889035fb -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs	(.../AssemblyToolHelperTest.cs)	(revision 150c8a50ff20b4056c1ad7a5ef12ef9f889035fb)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs	(.../AssemblyToolHelperTest.cs)	(revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba)
@@ -115,7 +115,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             // Call
@@ -134,7 +134,7 @@
             var random = new Random(21);
 
             var mocks = new MockRepository();
-            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             failurePath.InAssembly = false;
@@ -156,7 +156,7 @@
             double expectedAssemblyResult = random.NextDouble();
 
             var mocks = new MockRepository();
-            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResult>>();
             failurePath.Stub(fp => fp.AssemblyResult)
                        .Return(new FailurePathAssemblyResult
                        {
@@ -183,7 +183,7 @@
             double failureMechanismN = random.NextDouble();
 
             var mocks = new MockRepository();
-            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var failurePath = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResult>>();
             failurePath.Stub(fp => fp.AssemblyResult)
                        .Return(new FailurePathAssemblyResult
                        {
@@ -230,7 +230,7 @@
             double failureMechanismN = random.NextDouble();
 
             var mocks = new MockRepository();
-            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var failurePath = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResult>>();
             failurePath.Stub(fp => fp.AssemblyResult)
                        .Return(new FailurePathAssemblyResult
                        {
@@ -271,7 +271,7 @@
             double expectedAssemblyResult = random.NextDouble();
 
             var mocks = new MockRepository();
-            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
+            var failurePath = mocks.Stub<IHasSectionResults<FailureMechanismSectionResult>>();
             failurePath.Stub(fp => fp.AssemblyResult)
                        .Return(new FailurePathAssemblyResult
                        {
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs	(.../NonAdoptableFailureMechanismResultViewTest.cs)	(revision 6257662de18fbfde1fa3285f82648f2798cdc511)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableFailureMechanismResultViewTest.cs	(.../NonAdoptableFailureMechanismResultViewTest.cs)	(revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba)
@@ -251,7 +251,7 @@
             return (DataGridView) new ControlTester("dataGridView").TheObject;
         }
 
-        private class TestNonAdoptableFailureMechanism : FailureMechanismBase, IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableFailureMechanismSectionResult>
+        private class TestNonAdoptableFailureMechanism : FailureMechanismBase, IHasSectionResults< NonAdoptableFailureMechanismSectionResult>
         {
             private readonly ObservableList<NonAdoptableFailureMechanismSectionResult> sectionResults;
 
@@ -261,7 +261,6 @@
             }
 
             public override IEnumerable<ICalculation> Calculations { get; }
-            public IObservableEnumerable<FailureMechanismSectionResultOld> SectionResultsOld { get; }
             public IObservableEnumerable<NonAdoptableFailureMechanismSectionResult> SectionResults => sectionResults;
 
             protected override void AddSectionDependentData(FailureMechanismSection section)
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs)	(revision 6257662de18fbfde1fa3285f82648f2798cdc511)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs	(.../NonAdoptableWithProfileProbabilityFailureMechanismResultViewTest.cs)	(revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba)
@@ -338,7 +338,7 @@
             return failureMechanismResultView;
         }
 
-        private class TestNonAdoptableWithProfileProbabilityFailureMechanism : FailureMechanismBase, IHasSectionResults<FailureMechanismSectionResultOld, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
+        private class TestNonAdoptableWithProfileProbabilityFailureMechanism : FailureMechanismBase, IHasSectionResults<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
         {
             private readonly ObservableList<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> sectionResults;
 
@@ -350,7 +350,6 @@
             public bool UseLengthEffect { get; set; }
 
             public override IEnumerable<ICalculation> Calculations { get; }
-            public IObservableEnumerable<FailureMechanismSectionResultOld> SectionResultsOld { get; }
             public IObservableEnumerable<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> SectionResults => sectionResults;
 
             protected override void AddSectionDependentData(FailureMechanismSection section)
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6257662de18fbfde1fa3285f82648f2798cdc511 -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs	(.../StructuresFailureMechanismResultViewTest.cs)	(revision 6257662de18fbfde1fa3285f82648f2798cdc511)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs	(.../StructuresFailureMechanismResultViewTest.cs)	(revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba)
@@ -115,7 +115,7 @@
 
             // Call
             using (var view = new StructuresFailureMechanismResultView<TestStructuresFailureMechanism, TestStructuresInput>(
-                failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN))
+                       failureMechanism.SectionResults, failureMechanism, assessmentSection, fm => double.NaN))
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<AdoptableFailureMechanismSectionResult,
@@ -418,7 +418,7 @@
         }
 
         private class TestStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism,
-                                                       IHasSectionResults<FailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult>
+                                                       IHasSectionResults<AdoptableFailureMechanismSectionResult>
         {
             private readonly ObservableList<AdoptableFailureMechanismSectionResult> sectionResults;
 
@@ -432,7 +432,7 @@
             public CalculationGroup CalculationsGroup { get; }
 
             public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations();
-            public IObservableEnumerable<FailureMechanismSectionResultOld> SectionResultsOld { get; }
+
             public IObservableEnumerable<AdoptableFailureMechanismSectionResult> SectionResults => sectionResults;
 
             protected override void AddSectionDependentData(FailureMechanismSection section)
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs
===================================================================
diff -u -r75d9aa3f5d93ff0b6f4b725c5c3731277b0dcb29 -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba
--- Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs	(.../FailureMechanismSectionUpdateStrategyTest.cs)	(revision 75d9aa3f5d93ff0b6f4b725c5c3731277b0dcb29)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/FileImporters/FailureMechanismSectionUpdateStrategyTest.cs	(.../FailureMechanismSectionUpdateStrategyTest.cs)	(revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba)
@@ -59,7 +59,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             // Call
@@ -75,7 +75,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResult>>();
             var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
@@ -92,7 +92,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResult>>();
             var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
@@ -110,7 +110,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResultOld, TestFailureMechanismSectionResult>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<TestFailureMechanismSectionResult>>();
             var sectionResultUpdateStrategy = mocks.Stub<IFailureMechanismSectionResultUpdateStrategy<TestFailureMechanismSectionResult>>();
             mocks.ReplayAll();