Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rac91f4c76f9152b0041f684d2b38c9a5ae49d069 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -476,7 +476,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new ClosingStructuresProbabilityFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rac91f4c76f9152b0041f684d2b38c9a5ae49d069 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision ac91f4c76f9152b0041f684d2b38c9a5ae49d069)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailurePathContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,9 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.ClosingStructures.Data;
 using Riskeer.ClosingStructures.Forms.PresentationObjects;
 using Riskeer.Common.Data;
@@ -141,30 +138,18 @@
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-            Assert.AreEqual(4, outputsFolder.Contents.Count());
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
+            Assert.AreEqual(3, outputsFolder.Contents.Count());
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
-            }
-
-            var scenariosContext = (ClosingStructuresScenariosContext) outputsFolder.Contents.ElementAt(1);
+            var scenariosContext = (ClosingStructuresScenariosContext) outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism);
             Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData);
 
-            var failureMechanismResultsContext = (ClosingStructuresProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2);
+            var failureMechanismResultsContext = (ClosingStructuresProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
 
-            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(3);
+            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }
 
Fisheye: Tag 09fda91ef087b3955cdc6eb758901340b72ee4db refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/FailureMechanismAssemblyCategoriesContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r45d29bdd379d8d51bd02f4aae9aec185a0836755 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 45d29bdd379d8d51bd02f4aae9aec185a0836755)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -92,15 +92,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Categoriegrenzen.
-        /// </summary>
-        public static string AssemblyCategories_DisplayName {
-            get {
-                return ResourceManager.GetString("AssemblyCategories_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Kleur.
         /// </summary>
         public static string AssemblyCategory_Color_DisplayName {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r45d29bdd379d8d51bd02f4aae9aec185a0836755 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 45d29bdd379d8d51bd02f4aae9aec185a0836755)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -1430,9 +1430,6 @@
     <data name="FailureMechanismResultView_FailureMechanismAssemblyLabel" xml:space="preserve">
       <value>Gecombineerde faalkans [1/jaar]</value>
     </data>
-    <data name="AssemblyCategories_DisplayName" xml:space="preserve">
-    <value>Categoriegrenzen</value>
-  </data>
     <data name="AssemblyCategory_Color_DisplayName" xml:space="preserve">
     <value>Kleur</value>
   </data>
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismAssemblyCategoriesContextBaseTest.cs
===================================================================
diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismAssemblyCategoriesContextBaseTest.cs	(.../FailureMechanismAssemblyCategoriesContextBaseTest.cs)	(revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismAssemblyCategoriesContextBaseTest.cs	(.../FailureMechanismAssemblyCategoriesContextBaseTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -115,9 +115,9 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new FailureMechanismAssemblyCategoriesContext(failureMechanism,
-                                                                                    assessmentSection,
-                                                                                    null);
+            TestDelegate call = () => new TestFailureMechanismAssemblyCategoriesContextBase(failureMechanism,
+                                                                                            assessmentSection,
+                                                                                            null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
Fisheye: Tag 09fda91ef087b3955cdc6eb758901340b72ee4db refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/FailureMechanismAssemblyCategoriesContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -r743f2667e366193a75790dea1cdc3fd28dd13c6c -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 743f2667e366193a75790dea1cdc3fd28dd13c6c)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -451,7 +451,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new DuneErosionFailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.InAssemblyOutputComments
             };
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r743f2667e366193a75790dea1cdc3fd28dd13c6c -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailurePathContextTreeNodeInfoTest.cs	(.../DuneErosionFailurePathContextTreeNodeInfoTest.cs)	(revision 743f2667e366193a75790dea1cdc3fd28dd13c6c)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailurePathContextTreeNodeInfoTest.cs	(.../DuneErosionFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -28,9 +28,6 @@
 using Core.Gui.Forms.ViewHost;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
@@ -148,27 +145,14 @@
                 Assert.AreEqual("Oordeel", outputsFolder.Name);
                 Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-                Assert.AreEqual(3, outputsFolder.Contents.Count());
+                Assert.AreEqual(2, outputsFolder.Contents.Count());
 
-                var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-                Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-                Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
-                using (new AssemblyToolCalculatorFactoryConfigOld())
-                {
-                    var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                    AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                    failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                    Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
-                }
-
-                var failureMechanismResultsContext = (DuneErosionFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
+                var failureMechanismResultsContext = (DuneErosionFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(0);
                 Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
                 Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
                 Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-                var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
+                var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(1);
                 Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
             }
         }
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -raea41d3ef32d06dcf8f8eead38c19dcdde9df23f -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision aea41d3ef32d06dcf8f8eead38c19dcdde9df23f)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -618,7 +618,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new GrassCoverErosionInwardsProbabilityFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2de7d7cd7d8edb8fc797645a6a5ba65b1351e608 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs)	(revision 2de7d7cd7d8edb8fc797645a6a5ba65b1351e608)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,9 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
@@ -141,29 +138,17 @@
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-            Assert.AreEqual(4, outputsFolder.Contents.Count());
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
+            Assert.AreEqual(3, outputsFolder.Contents.Count());
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
-            }
-
-            var scenariosContext = (GrassCoverErosionInwardsScenariosContext) outputsFolder.Contents.ElementAt(1);
+            var scenariosContext = (GrassCoverErosionInwardsScenariosContext) outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData);
             Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism);
 
-            var failureMechanismResultsContext = (GrassCoverErosionInwardsProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2);
+            var failureMechanismResultsContext = (GrassCoverErosionInwardsProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(3);
+            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }
 
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -raacd6850ae589059dc1909ceaa2a1bc27308d65d -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision aacd6850ae589059dc1909ceaa2a1bc27308d65d)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -404,7 +404,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new GrassCoverErosionOutwardsFailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.InAssemblyOutputComments
             };
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd45fcaaa3ed0debc693959db83a519288644fb5f -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailurePathContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailurePathContextTreeNodeInfoTest.cs)	(revision d45fcaaa3ed0debc693959db83a519288644fb5f)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailurePathContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,9 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
@@ -141,26 +138,14 @@
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-            Assert.AreEqual(3, outputsFolder.Contents.Count());
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
+            Assert.AreEqual(2, outputsFolder.Contents.Count());
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
-            }
-
             var failureMechanismResultsContext = (GrassCoverErosionOutwardsFailureMechanismSectionResultContext)
-                outputsFolder.Contents.ElementAt(1);
+                outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
+            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }
 
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r8871305b1487621444a088cad1b9410428f38f8e -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 8871305b1487621444a088cad1b9410428f38f8e)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -476,7 +476,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new HeightStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new HeightStructuresProbabilityFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rced2dc8f7eccb2fdbd3e42631c6215ef21bce854 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailurePathContextTreeNodeInfoTest.cs	(.../HeightStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision ced2dc8f7eccb2fdbd3e42631c6215ef21bce854)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailurePathContextTreeNodeInfoTest.cs	(.../HeightStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,9 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
@@ -141,30 +138,18 @@
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-            Assert.AreEqual(4, outputsFolder.Contents.Count());
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
+            Assert.AreEqual(3, outputsFolder.Contents.Count());
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
-            }
-
-            var scenariosContext = (HeightStructuresScenariosContext) outputsFolder.Contents.ElementAt(1);
+            var scenariosContext = (HeightStructuresScenariosContext) outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism);
             Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData);
 
-            var failureMechanismResultsContext = (HeightStructuresProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2);
+            var failureMechanismResultsContext = (HeightStructuresProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
 
-            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(3);
+            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }
 
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r23555ddacb0d4a0223611d98417fd4106c69a35b -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 23555ddacb0d4a0223611d98417fd4106c69a35b)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -1141,17 +1141,6 @@
                                                                                  .Build()
             };
 
-            yield return new TreeNodeInfo<FailureMechanismAssemblyCategoriesContext>
-            {
-                Text = context => RiskeerCommonFormsResources.AssemblyCategories_DisplayName,
-                Image = context => RiskeerCommonFormsResources.NormsIcon,
-                ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
-                                                                                 .AddOpenItem()
-                                                                                 .AddSeparator()
-                                                                                 .AddPropertiesItem()
-                                                                                 .Build()
-            };
-
             yield return new TreeNodeInfo<AssemblyResultsContext>
             {
                 Text = context => Resources.AssemblyResultsCategoryTreeFolder_DisplayName,
@@ -2498,8 +2487,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(
-                    failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new PipingStructureFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.InAssemblyOutputComments
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r23555ddacb0d4a0223611d98417fd4106c69a35b -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 23555ddacb0d4a0223611d98417fd4106c69a35b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -596,7 +596,7 @@
                 TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(45, treeNodeInfos.Length);
+                Assert.AreEqual(44, treeNodeInfos.Length);
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSectionStateRootContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(HydraulicLoadsStateRootContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CalculationsStateRootContext)));
@@ -636,7 +636,6 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(StructuresOutputContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultTotalContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultPerSectionContext)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismAssemblyCategoriesContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultsContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssemblyResultPerSectionMapContext)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(GenericFailurePathsContext)));
Fisheye: Tag 09fda91ef087b3955cdc6eb758901340b72ee4db refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismAssemblyCategoriesContextTreeNodeInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -rcae86e85207fdc7bbdd45179588f5d3c56bac58f -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailurePathContextTreeNodeInfoTest.cs	(.../PipingStructureFailurePathContextTreeNodeInfoTest.cs)	(revision cae86e85207fdc7bbdd45179588f5d3c56bac58f)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailurePathContextTreeNodeInfoTest.cs	(.../PipingStructureFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,9 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
@@ -164,29 +161,16 @@
             Assert.AreSame(failureMechanism.InAssemblyInputComments, inAssemblyInputComments);
 
             var outputFolder = (CategoryTreeFolder) children[1];
-            Assert.AreEqual(3, outputFolder.Contents.Count());
+            Assert.AreEqual(2, outputFolder.Contents.Count());
             Assert.AreEqual("Oordeel", outputFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
-            }
-
             var failureMechanismResultsContext = (PipingStructureFailureMechanismSectionResultContext)
-                outputFolder.Contents.ElementAt(1);
+                outputFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var inAssemblyOutputComments = (Comment) outputFolder.Contents.ElementAt(2);
+            var inAssemblyOutputComments = (Comment) outputFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }
 
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs
===================================================================
diff -u -r9df23f511e07e317ce8285fc1c77b48428e7d464 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 9df23f511e07e317ce8285fc1c77b48428e7d464)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs	(.../MacroStabilityInwardsPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -35,7 +35,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Forms.ChangeHandlers;
 using Riskeer.Common.Forms.ExportInfos;
 using Riskeer.Common.Forms.ImportInfos;
@@ -695,12 +694,8 @@
 
         private static IEnumerable<object> GetFailurePathOutputs(MacroStabilityInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
-            MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput;
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism,
-                                                              assessmentSection,
-                                                              () => probabilityAssessmentInput.GetN(assessmentSection.ReferenceLine.Length)),
                 new MacroStabilityInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new MacroStabilityInwardsProbabilityFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r198210b3806e24e83418c1f67078b1d26cd6205d -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailurePathContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsFailurePathContextTreeNodeInfoTest.cs)	(revision 198210b3806e24e83418c1f67078b1d26cd6205d)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailurePathContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,13 +27,9 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Plugin.TestUtil;
@@ -143,31 +139,18 @@
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-            Assert.AreEqual(4, outputsFolder.Contents.Count());
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
+            Assert.AreEqual(3, outputsFolder.Contents.Count());
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput;
-                Assert.AreEqual(probabilityAssessmentInput.GetN(assessmentSection.ReferenceLine.Length), calculator.AssemblyCategoriesInput.N);
-            }
-
-            var failureMechanismScenariosContext = (MacroStabilityInwardsScenariosContext) outputsFolder.Contents.ElementAt(1);
+            var failureMechanismScenariosContext = (MacroStabilityInwardsScenariosContext) outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismScenariosContext.FailureMechanism);
             Assert.AreSame(failureMechanism.CalculationsGroup, failureMechanismScenariosContext.WrappedData);
 
-            var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>) outputsFolder.Contents.ElementAt(2);
+            var failureMechanismResultsContext = (ProbabilityFailureMechanismSectionResultContext<AdoptableWithProfileProbabilityFailureMechanismSectionResult>) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
 
-            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(3);
+            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }
 
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r1a74cf8870ea2f43e667b624b90347a5a3b71704 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -35,7 +35,6 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Forms.ChangeHandlers;
 using Riskeer.Common.Forms.ExportInfos;
 using Riskeer.Common.Forms.ImportInfos;
@@ -880,12 +879,8 @@
 
         private static IEnumerable<object> GetFailurePathOutputs(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
-            PipingProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.PipingProbabilityAssessmentInput;
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism,
-                                                              assessmentSection,
-                                                              () => probabilityAssessmentInput.GetN(assessmentSection.ReferenceLine.Length)),
                 new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection),
                 new PipingProbabilityFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1a74cf8870ea2f43e667b624b90347a5a3b71704 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs	(.../PipingFailurePathContextTreeNodeInfoTest.cs)	(revision 1a74cf8870ea2f43e667b624b90347a5a3b71704)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailurePathContextTreeNodeInfoTest.cs	(.../PipingFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,12 +27,8 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Probability;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.PresentationObjects;
 using Riskeer.Common.Plugin.TestUtil;
@@ -142,32 +138,19 @@
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-            Assert.AreEqual(4, outputsFolder.Contents.Count());
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
+            Assert.AreEqual(3, outputsFolder.Contents.Count());
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                PipingProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.PipingProbabilityAssessmentInput;
-                Assert.AreEqual(probabilityAssessmentInput.GetN(assessmentSection.ReferenceLine.Length), calculator.AssemblyCategoriesInput.N);
-            }
-
-            var failureMechanismScenariosContext = (PipingScenariosContext) outputsFolder.Contents.ElementAt(1);
+            var failureMechanismScenariosContext = (PipingScenariosContext) outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismScenariosContext.FailureMechanism);
             Assert.AreSame(failureMechanism.CalculationsGroup, failureMechanismScenariosContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismScenariosContext.AssessmentSection);
 
-            var failureMechanismResultsContext = (PipingProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2);
+            var failureMechanismResultsContext = (PipingProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
 
-            var commentContext = (Comment) outputsFolder.Contents.ElementAt(3);
+            var commentContext = (Comment) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, commentContext);
         }
 
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r01e0f96e7377817e1ebeff76d8377d65ba76d72a -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 01e0f96e7377817e1ebeff76d8377d65ba76d72a)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -473,7 +473,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new StabilityPointStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new StabilityPointStructuresProbabilityFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r307f782511e5d6ccc9ae827882f46e4ab188cfd0 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailurePathContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision 307f782511e5d6ccc9ae827882f46e4ab188cfd0)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailurePathContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,9 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
@@ -141,30 +138,18 @@
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
 
-            Assert.AreEqual(4, outputsFolder.Contents.Count());
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
+            Assert.AreEqual(3, outputsFolder.Contents.Count());
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
-            }
-
-            var scenariosContext = (StabilityPointStructuresScenariosContext) outputsFolder.Contents.ElementAt(1);
+            var scenariosContext = (StabilityPointStructuresScenariosContext) outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, scenariosContext.ParentFailureMechanism);
             Assert.AreSame(failureMechanism.CalculationsGroup, scenariosContext.WrappedData);
 
-            var failureMechanismResultsContext = (StabilityPointStructuresProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(2);
+            var failureMechanismResultsContext = (StabilityPointStructuresProbabilityFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
 
-            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(3);
+            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }
 
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -raaea9a6608ef667d6b4f6318ac33eebe3819ec5a -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision aaea9a6608ef667d6b4f6318ac33eebe3819ec5a)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -401,7 +401,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(failureMechanism, assessmentSection, () => failureMechanism.GeneralInput.N),
                 new StabilityStoneCoverFailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.InAssemblyOutputComments
             };
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs)	(revision 9650e7e51fb6bab7a5ea99487ccb143dd7bac8c1)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,9 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
@@ -140,26 +137,13 @@
             var outputsFolder = (CategoryTreeFolder) children[1];
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
-            Assert.AreEqual(3, outputsFolder.Contents.Count());
+            Assert.AreEqual(2, outputsFolder.Contents.Count());
 
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                Assert.AreEqual(failureMechanism.GeneralInput.N, calculator.AssemblyCategoriesInput.N);
-            }
-
-            var failureMechanismResultsContext = (StabilityStoneCoverFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
+            var failureMechanismResultsContext = (StabilityStoneCoverFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
+            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }
 
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r3b838833901be7e334c406b2214e00341878f9c7 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 3b838833901be7e334c406b2214e00341878f9c7)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -406,9 +406,6 @@
         {
             return new object[]
             {
-                new FailureMechanismAssemblyCategoriesContext(
-                    failureMechanism, assessmentSection, () => failureMechanism.GeneralWaveImpactAsphaltCoverInput.GetN(
-                        assessmentSection.ReferenceLine.Length)),
                 new WaveImpactAsphaltCoverFailureMechanismSectionResultContext(
                     failureMechanism.SectionResults, failureMechanism, assessmentSection),
                 failureMechanism.InAssemblyOutputComments
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3b838833901be7e334c406b2214e00341878f9c7 -r09fda91ef087b3955cdc6eb758901340b72ee4db
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs)	(revision 3b838833901be7e334c406b2214e00341878f9c7)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailurePathContextTreeNodeInfoTest.cs)	(revision 09fda91ef087b3955cdc6eb758901340b72ee4db)
@@ -27,9 +27,6 @@
 using Core.Gui.ContextMenu;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
@@ -140,27 +137,14 @@
             var outputsFolder = (CategoryTreeFolder) children[1];
             Assert.AreEqual("Oordeel", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
-            Assert.AreEqual(3, outputsFolder.Contents.Count());
+            Assert.AreEqual(2, outputsFolder.Contents.Count());
 
-            var failureMechanismAssemblyCategoriesContext = (FailureMechanismAssemblyCategoriesContext) outputsFolder.Contents.ElementAt(0);
-            Assert.AreSame(failureMechanism, failureMechanismAssemblyCategoriesContext.WrappedData);
-            Assert.AreSame(assessmentSection, failureMechanismAssemblyCategoriesContext.AssessmentSection);
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
-
-                failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
-                Assert.AreEqual(failureMechanism.GeneralWaveImpactAsphaltCoverInput.GetN(assessmentSection.ReferenceLine.Length), calculator.AssemblyCategoriesInput.N);
-            }
-
-            var failureMechanismResultsContext = (WaveImpactAsphaltCoverFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(1);
+            var failureMechanismResultsContext = (WaveImpactAsphaltCoverFailureMechanismSectionResultContext) outputsFolder.Contents.ElementAt(0);
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(assessmentSection, failureMechanismResultsContext.AssessmentSection);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(2);
+            var inAssemblyOutputComments = (Comment) outputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.InAssemblyOutputComments, inAssemblyOutputComments);
         }