Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs
===================================================================
diff -u -r41d1274632ecac576d2295240be59c3855c1c36e -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs	(.../AssemblyToolHelper.cs)	(revision 41d1274632ecac576d2295240be59c3855c1c36e)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs	(.../AssemblyToolHelper.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -79,7 +79,7 @@
         /// or <paramref name="performSectionAssemblyFunc"/> is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when the failure mechanism could not be successfully assembled.</exception>
         public static double AssemblyFailureMechanism<TSectionResult>(
-            IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult> failureMechanism,
+            IHasSectionResults<TSectionResult> failureMechanism,
             Func<TSectionResult, FailureMechanismSectionAssemblyResult> performSectionAssemblyFunc,
             double failureMechanismN)
             where TSectionResult : FailureMechanismSectionResult
Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs
===================================================================
diff -u -rdcf0daecff8fe9d5f20f78226b88a8da9f8f2c96 -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs	(.../AssemblyMapDataFeaturesFactory.cs)	(revision dcf0daecff8fe9d5f20f78226b88a8da9f8f2c96)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs	(.../AssemblyMapDataFeaturesFactory.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -47,7 +47,7 @@
         /// <returns>A collection of <see cref="MapFeature"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public static IEnumerable<MapFeature> CreateAssemblyGroupFeatures<TSectionResult>(
-            IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult> failureMechanism,
+            IHasSectionResults<TSectionResult> failureMechanism,
             Func<TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc)
             where TSectionResult : FailureMechanismSectionResult
         {
Index: Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs
===================================================================
diff -u -r9616d6e1fe303f236014e8f5f668a3990373d16b -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs	(.../CalculatableFailureMechanismSectionResultsMapLayer.cs)	(revision 9616d6e1fe303f236014e8f5f668a3990373d16b)
+++ Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/CalculatableFailureMechanismSectionResultsMapLayer.cs	(.../CalculatableFailureMechanismSectionResultsMapLayer.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -35,7 +35,7 @@
     /// <typeparam name="TSectionResult">The type of section result.</typeparam>
     /// <typeparam name="TCalculationInput">The type of calculation input.</typeparam>
     public class CalculatableFailureMechanismSectionResultsMapLayer<TFailureMechanism, TSectionResult, TCalculationInput> : NonCalculatableFailureMechanismSectionResultsMapLayer<TSectionResult>
-        where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
+        where TFailureMechanism : IHasSectionResults<TSectionResult>, ICalculatableFailureMechanism
         where TSectionResult : FailureMechanismSectionResult
         where TCalculationInput : class, ICalculationInput
     {
Index: Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs
===================================================================
diff -u -r04a73cec01f7db0f63386553c627dd1a6943acdc -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs	(.../NonCalculatableFailureMechanismSectionResultsMapLayer.cs)	(revision 04a73cec01f7db0f63386553c627dd1a6943acdc)
+++ Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/NonCalculatableFailureMechanismSectionResultsMapLayer.cs	(.../NonCalculatableFailureMechanismSectionResultsMapLayer.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -37,7 +37,7 @@
     {
         private readonly Func<TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc;
 
-        private readonly IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult> failureMechanism;
+        private readonly IHasSectionResults<TSectionResult> failureMechanism;
 
         private Observer failureMechanismObserver;
         private RecursiveObserver<IObservableEnumerable<TSectionResult>, TSectionResult> sectionResultObserver;
@@ -49,7 +49,7 @@
         /// <param name="performAssemblyFunc">The <see cref="Func{T1,TResult}"/> used to assemble the result of a section result.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
         public NonCalculatableFailureMechanismSectionResultsMapLayer(
-            IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult> failureMechanism,
+            IHasSectionResults<TSectionResult> failureMechanism,
             Func<TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc)
         {
             if (failureMechanism == null)
Index: Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs
===================================================================
diff -u -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77 -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs	(.../CalculatableFailureMechanismResultObserver.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Observers/CalculatableFailureMechanismResultObserver.cs	(.../CalculatableFailureMechanismResultObserver.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -35,7 +35,7 @@
     /// <typeparam name="TCalculation">The type of the calculations in the <typeparamref name="TFailureMechanism"/>.</typeparam>
     public class CalculatableFailureMechanismResultObserver<TFailureMechanism, TSectionResult, TCalculation>
         : FailureMechanismResultObserver<TFailureMechanism, TSectionResult>
-        where TFailureMechanism : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>, ICalculatableFailureMechanism
+        where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>, ICalculatableFailureMechanism
         where TSectionResult : FailureMechanismSectionResult
         where TCalculation : ICalculation<ICalculationInput>
     {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs
===================================================================
diff -u -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77 -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs	(.../FailureMechanismResultObserver.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Observers/FailureMechanismResultObserver.cs	(.../FailureMechanismResultObserver.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -32,11 +32,10 @@
     /// <typeparam name="TFailureMechanism">The type of the failure mechanism to observe.</typeparam>
     /// <typeparam name="TSectionResult">The type of the section results in the failure mechanism.</typeparam>
     public class FailureMechanismResultObserver<TFailureMechanism, TSectionResult> : Observable, IDisposable
-        where TFailureMechanism : IFailureMechanism, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+        where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>
         where TSectionResult : FailureMechanismSectionResult
     {
         private readonly Observer failureMechanismObserver;
-        private readonly Observer failureMechanismSectionResultObserver;
         private readonly RecursiveObserver<IObservableEnumerable<TSectionResult>, TSectionResult> failureMechanismSectionResultsObserver;
 
         /// <summary>
@@ -56,11 +55,6 @@
                 Observable = failureMechanism
             };
 
-            failureMechanismSectionResultObserver = new Observer(NotifyObservers)
-            {
-                Observable = failureMechanism.SectionResultsOld
-            };
-
             failureMechanismSectionResultsObserver = new RecursiveObserver<IObservableEnumerable<TSectionResult>, TSectionResult>(
                 NotifyObservers,
                 sr => sr)
@@ -80,7 +74,6 @@
             if (disposing)
             {
                 failureMechanismObserver.Dispose();
-                failureMechanismSectionResultObserver.Dispose();
                 failureMechanismSectionResultsObserver.Dispose();
             }
         }
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -r00a56244b50c5a359475c5135cccc004aa9d3689 -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 00a56244b50c5a359475c5135cccc004aa9d3689)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -48,7 +48,7 @@
     public abstract partial class FailureMechanismResultView<TSectionResult, TSectionResultRow, TFailureMechanism> : UserControl, IView
         where TSectionResult : FailureMechanismSectionResult
         where TSectionResultRow : FailureMechanismSectionResultRow<TSectionResult>
-        where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+        where TFailureMechanism : IHasSectionResults<TSectionResult>
     {
         private readonly IObservableEnumerable<TSectionResult> failureMechanismSectionResults;
         private readonly Observer failureMechanismObserver;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs
===================================================================
diff -u -r50c99cdebe8bbc6fe3b834db74e3a3711ddf2409 -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs	(.../StructuresFailureMechanismResultView.cs)	(revision 50c99cdebe8bbc6fe3b834db74e3a3711ddf2409)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs	(.../StructuresFailureMechanismResultView.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -39,7 +39,7 @@
     /// <typeparam name="TFailureMechanism">The type of failure mechanism.</typeparam>
     /// <typeparam name="TStructuresInput">The type of input.</typeparam>
     public class StructuresFailureMechanismResultView<TFailureMechanism, TStructuresInput> : FailureMechanismResultView<AdoptableFailureMechanismSectionResult, AdoptableFailureMechanismSectionResultRow, TFailureMechanism>
-        where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, AdoptableFailureMechanismSectionResult>, ICalculatableFailureMechanism
+        where TFailureMechanism : IHasSectionResults<AdoptableFailureMechanismSectionResult>, ICalculatableFailureMechanism
         where TStructuresInput : IStructuresCalculationInput<StructureBase>, new()
     {
         private const int initialFailureMechanismResultTypeIndex = 2;
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs
===================================================================
diff -u -r42a52ece10b0c22d14d333ca7c085ca8fd4caa77 -r8658d36cc32a7af5ea898721e85abe5985b52fb1
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs	(.../FailureMechanismResultObserverTest.cs)	(revision 42a52ece10b0c22d14d333ca7c085ca8fd4caa77)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Observers/FailureMechanismResultObserverTest.cs	(.../FailureMechanismResultObserverTest.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
@@ -37,10 +37,10 @@
         public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(null);
+            void Call() => new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("failureMechanism", exception.ParamName);
         }
 
@@ -80,29 +80,6 @@
         }
 
         [Test]
-        public void GivenFailureMechanismResultObserverWithAttachedObserver_WhenFailureMechanismSectionResultCollectionNotifiesObservers_ThenAttachedObserverNotified()
-        {
-            // Given
-            var failureMechanism = new TestFailureMechanism();
-
-            using (var resultObserver = new FailureMechanismResultObserver<TestFailureMechanism, FailureMechanismSectionResult>(failureMechanism))
-            {
-                var mocks = new MockRepository();
-                var observer = mocks.StrictMock<IObserver>();
-                observer.Expect(o => o.UpdateObserver());
-                mocks.ReplayAll();
-
-                resultObserver.Attach(observer);
-
-                // When
-                failureMechanism.SectionResultsOld.NotifyObservers();
-
-                // Then
-                mocks.VerifyAll();
-            }
-        }
-
-        [Test]
         public void GivenFailureMechanismResultObserverWithAttachedObserver_WhenFailureMechanismSectionResultNotifiesObservers_ThenAttachedObserverNotified()
         {
             // Given