Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rce79c9c34ebed8fa715e523a886269a41e1e50c1 -reda4b6196511abd0d2272c58db14e31c1efab0b4
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision ce79c9c34ebed8fa715e523a886269a41e1e50c1)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision eda4b6196511abd0d2272c58db14e31c1efab0b4)
@@ -370,11 +370,9 @@
 
         public override IEnumerable<TreeNodeInfo> GetTreeNodeInfos()
         {
-            yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo<PipingFailureMechanismCalculationStateContext>(
-                FailureMechanismEnabledChildNodeObjects,
-                FailureMechanismDisabledChildNodeObjects,
-                FailureMechanismEnabledContextMenuStrip,
-                FailureMechanismDisabledContextMenuStrip);
+            yield return RiskeerTreeNodeInfoFactory.CreateFailureMechanismCalculationStateContextTreeNodeInfo<PipingFailureMechanismCalculationStateContext>(
+                FailureMechanismCalculationStateChildNodeObjects,
+                FailureMechanismCalculationStateContextMenuStrip);
 
             yield return RiskeerTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo<SemiProbabilisticPipingCalculationScenarioContext>(
                 SemiProbabilisticPipingCalculationScenarioContextChildNodeObjects,
@@ -784,7 +782,7 @@
 
         #region PipingFailureMechanismCalculationStateContext TreeNodeInfo
 
-        private static object[] FailureMechanismEnabledChildNodeObjects(PipingFailureMechanismCalculationStateContext context)
+        private static object[] FailureMechanismCalculationStateChildNodeObjects(PipingFailureMechanismCalculationStateContext context)
         {
             PipingFailureMechanism wrappedData = context.WrappedData;
             IAssessmentSection assessmentSection = context.Parent;
@@ -797,14 +795,6 @@
             };
         }
 
-        private static object[] FailureMechanismDisabledChildNodeObjects(PipingFailureMechanismCalculationStateContext context)
-        {
-            return new object[]
-            {
-                context.WrappedData.NotRelevantComments
-            };
-        }
-
         private static IEnumerable<object> GetInputs(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new object[]
@@ -830,9 +820,9 @@
             };
         }
 
-        private ContextMenuStrip FailureMechanismEnabledContextMenuStrip(PipingFailureMechanismCalculationStateContext context,
-                                                                         object parentData,
-                                                                         TreeViewControl treeViewControl)
+        private ContextMenuStrip FailureMechanismCalculationStateContextMenuStrip(PipingFailureMechanismCalculationStateContext context,
+                                                                                  object parentData,
+                                                                                  TreeViewControl treeViewControl)
         {
             IEnumerable<ProbabilisticPipingCalculationScenario> calculations = context.WrappedData
                                                                                       .Calculations
@@ -864,21 +854,6 @@
                           .Build();
         }
 
-        private ContextMenuStrip FailureMechanismDisabledContextMenuStrip(PipingFailureMechanismCalculationStateContext context,
-                                                                          object parentData,
-                                                                          TreeViewControl treeViewControl)
-        {
-            var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl));
-
-            return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem)
-                          .AddSeparator()
-                          .AddCollapseAllItem()
-                          .AddExpandAllItem()
-                          .AddSeparator()
-                          .AddPropertiesItem()
-                          .Build();
-        }
-
         private void RemoveAllViewsForItem(PipingFailureMechanismCalculationStateContext context)
         {
             Gui.ViewCommands.RemoveAllViewsForItem(context);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismCalculationStateContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2ccc9719a576f038a60d33dda2a07bcb69b3c466 -reda4b6196511abd0d2272c58db14e31c1efab0b4
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismCalculationStateContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismCalculationStateContextTreeNodeInfoTest.cs)	(revision 2ccc9719a576f038a60d33dda2a07bcb69b3c466)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismCalculationStateContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismCalculationStateContextTreeNodeInfoTest.cs)	(revision eda4b6196511abd0d2272c58db14e31c1efab0b4)
@@ -136,7 +136,7 @@
         }
 
         [Test]
-        public void ChildNodeObjects_FailureMechanismIsRelevant_ReturnChildDataNodes()
+        public void ChildNodeObjects_Always_ReturnChildDataNodes()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
@@ -211,29 +211,6 @@
         }
 
         [Test]
-        public void ChildNodeObjects_FailureMechanismIsNotRelevant_ReturnOnlyFailureMechanismNotRelevantComments()
-        {
-            // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var pipingFailureMechanism = new PipingFailureMechanism
-            {
-                IsRelevant = false
-            };
-
-            var context = new PipingFailureMechanismCalculationStateContext(pipingFailureMechanism, assessmentSection);
-
-            // Call
-            object[] children = info.ChildNodeObjects(context).ToArray();
-
-            // Assert
-            Assert.AreEqual(1, children.Length);
-            var comment = (Comment) children[0];
-            Assert.AreSame(pipingFailureMechanism.NotRelevantComments, comment);
-        }
-
-        [Test]
         [TestCase(false)]
         [TestCase(true)]
         public void GivenMultiplePipingCalculationsWithOutput_WhenClearingOutputFromContextMenu_ThenPipingOutputCleared(bool confirm)
@@ -612,7 +589,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsRelevant_CallsContextMenuBuilderMethods()
+        public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
             using (var treeViewControl = new TreeViewControl())
@@ -657,45 +634,6 @@
         }
 
         [Test]
-        public void ContextMenuStrip_FailureMechanismIsNotRelevant_CallsContextMenuBuilderMethods()
-        {
-            // Setup
-            var treeViewControl = new TreeViewControl();
-            {
-                var pipingFailureMechanism = new PipingFailureMechanism
-                {
-                    IsRelevant = false
-                };
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
-                var context = new PipingFailureMechanismCalculationStateContext(pipingFailureMechanism, assessmentSection);
-
-                var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
-                using (mocks.Ordered())
-                {
-                    menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.Build()).Return(null);
-                }
-
-                var gui = mocks.Stub<IGui>();
-                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
-                mocks.ReplayAll();
-
-                plugin.Gui = gui;
-
-                // Call
-                info.ContextMenuStrip(context, null, treeViewControl);
-            }
-
-            // Assert
-            // Assert expectancies are called in TearDown()
-        }
-
-        [Test]
         public void ContextMenuStrip_ClickOnValidateAllItem_ValidateAllChildCalculations()
         {
             // Setup