Index: Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs
===================================================================
diff -u -ree944aa350b4347a26a2ca337352272a373a487d -rbd7885ae0b850e7c716f6dd703bbbac2344bf564
--- Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision ee944aa350b4347a26a2ca337352272a373a487d)
+++ Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision bd7885ae0b850e7c716f6dd703bbbac2344bf564)
@@ -52,7 +52,7 @@
                 return ReferenceEquals(view.Data, context.WrappedData);
             }
 
-            IEnumerable<ICalculation> calculations;
+            IEnumerable<ICalculation> calculations = Enumerable.Empty<ICalculation>();
 
             var calculationGroupContext = removedObject as ICalculationContext<CalculationGroup, IFailureMechanism>;
             if (calculationGroupContext != null)
@@ -127,13 +127,6 @@
         private static IEnumerable<ICalculation> GetCalculationsFromFailureMechanisms(object o)
         {
             var failureMechanism = o as IFailureMechanism;
-
-            var context = o as IFailurePathContext<IFailureMechanism>;
-            if (context != null)
-            {
-                failureMechanism = context.WrappedData;
-            }
-
             if (failureMechanism != null)
             {
                 return failureMechanism.Calculations;
Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs
===================================================================
diff -u -r8827a41d5876d9d929fa5a6536c18b46a851fc9a -rbd7885ae0b850e7c716f6dd703bbbac2344bf564
--- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs	(.../ShouldCloseViewWithCalculationDataTester.cs)	(revision 8827a41d5876d9d929fa5a6536c18b46a851fc9a)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/ShouldCloseViewWithCalculationDataTester.cs	(.../ShouldCloseViewWithCalculationDataTester.cs)	(revision bd7885ae0b850e7c716f6dd703bbbac2344bf564)
@@ -108,12 +108,11 @@
         public void ShouldCloseMethod_ViewCorrespondingWithRemovedFailureMechanism_ReturnsTrue()
         {
             // Setup
-            IFailurePathContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
-
-            using (IView view = GetView(failureMechanismContext.WrappedData.Calculations.First()))
+            IFailureMechanism failureMechanism = GetFailureMechanismWithCalculation();
+            using (IView view = GetView(failureMechanism.Calculations.First()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext.WrappedData);
+                bool closeForData = ShouldCloseMethod(view, failureMechanism);
 
                 // Assert
                 Assert.IsTrue(closeForData);
@@ -124,59 +123,25 @@
         public void ShouldCloseMethod_ViewNotCorrespondingWithRemovedFailureMechanism_ReturnsFalse()
         {
             // Setup
-            IFailurePathContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
-
+            IFailureMechanism failureMechanism = GetFailureMechanismWithCalculation();
             using (IView view = GetView(GetCalculation()))
             {
                 // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext.WrappedData);
+                bool closeForData = ShouldCloseMethod(view, failureMechanism);
 
                 // Assert
                 Assert.IsFalse(closeForData);
             }
         }
-
+        
         [Test]
-        public void ShouldCloseMethod_ViewCorrespondingWithRemovedFailureMechanismContext_ReturnsTrue()
-        {
-            // Setup
-            IFailurePathContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
-
-            using (IView view = GetView(failureMechanismContext.WrappedData.Calculations.First()))
-            {
-                // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
-
-                // Assert
-                Assert.IsTrue(closeForData);
-            }
-        }
-
-        [Test]
-        public void ShouldCloseMethod_ViewNotCorrespondingWithRemovedFailureMechanismContext_ReturnsFalse()
-        {
-            // Setup
-            IFailurePathContext<IFailureMechanism> failureMechanismContext = GetFailureMechanismContextWithCalculation();
-
-            using (IView view = GetView(GetCalculation()))
-            {
-                // Call
-                bool closeForData = ShouldCloseMethod(view, failureMechanismContext);
-
-                // Assert
-                Assert.IsFalse(closeForData);
-            }
-        }
-
-        [Test]
         public void ShouldCloseMethod_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue()
         {
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
 
-            IFailureMechanism failureMechanism = GetFailureMechanismContextWithCalculation().WrappedData;
-
+            IFailureMechanism failureMechanism = GetFailureMechanismWithCalculation();
             assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
             {
                 failureMechanism
@@ -203,8 +168,7 @@
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
 
-            IFailureMechanism failureMechanism = GetFailureMechanismContextWithCalculation().WrappedData;
-
+            IFailureMechanism failureMechanism = GetFailureMechanismWithCalculation();
             assessmentSection.Stub(a => a.GetFailureMechanisms()).Return(new[]
             {
                 failureMechanism
@@ -270,13 +234,13 @@
         }
 
         /// <summary>
-        /// Gets a failure mechanism context for testing purposes.
+        /// Gets a failure mechanism for testing purposes.
         /// </summary>
-        /// <returns>A failure mechanism context object.</returns>
+        /// <returns>A failure mechanism object.</returns>
         /// <remarks>A default implementation is added for creating a <see cref="TestFailureMechanismContext"/>.</remarks>
-        protected virtual IFailurePathContext<IFailureMechanism> GetFailureMechanismContextWithCalculation()
+        protected virtual IFailureMechanism GetFailureMechanismWithCalculation()
         {
-            return new TestFailureMechanismContext();
+            return new TestFailureMechanism();
         }
 
         private class TestCalculationContext : Observable, ICalculationContext<TestCalculation, TestFailureMechanism>
@@ -316,20 +280,5 @@
 
             public TestFailureMechanism FailureMechanism { get; }
         }
-
-        private class TestFailureMechanismContext : Observable, IFailurePathContext<TestFailureMechanism>
-        {
-            public TestFailureMechanismContext()
-            {
-                WrappedData = new TestFailureMechanism(new[]
-                {
-                    new TestCalculation("Calculation")
-                });
-            }
-
-            public TestFailureMechanism WrappedData { get; }
-
-            public IAssessmentSection Parent { get; }
-        }
     }
 }
\ No newline at end of file