Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rd4f68e1d5c93d481cbc3adfd16c54e32f8751961
--- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactory.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableStabilityStoneCoverFailureMechanismFactory.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactory.cs)	(revision d4f68e1d5c93d481cbc3adfd16c54e32f8751961)
@@ -72,7 +72,7 @@
                                                                                                                    failureMechanismAssemblyMethod);
             }
 
-            FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleFailureMechanism(failureMechanism, false);
+            const FailureMechanismAssemblyCategoryGroup failureMechanismAssembly = FailureMechanismAssemblyCategoryGroup.None;
 
             return new ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult>(
                 new ExportableFailureMechanismAssemblyResult(failureMechanismAssemblyMethod, failureMechanismAssembly),
@@ -98,17 +98,11 @@
             var exportableResults = new List<ExportableAggregatedFailureMechanismSectionAssemblyResult>();
             foreach (KeyValuePair<StabilityStoneCoverFailureMechanismSectionResultOld, ExportableFailureMechanismSection> failureMechanismSectionPair in failureMechanismSectionsLookup)
             {
-                StabilityStoneCoverFailureMechanismSectionResultOld failureMechanismSectionResult = failureMechanismSectionPair.Key;
+                const FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
+                const FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
+                const FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
+                const FailureMechanismSectionAssemblyCategoryGroup combinedAssembly = FailureMechanismSectionAssemblyCategoryGroup.None;
 
-                FailureMechanismSectionAssemblyCategoryGroup simpleAssembly =
-                    StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleSimpleAssessment(failureMechanismSectionResult);
-                FailureMechanismSectionAssemblyCategoryGroup detailedAssembly =
-                    StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleDetailedAssessment(failureMechanismSectionResult);
-                FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly =
-                    StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleTailorMadeAssessment(failureMechanismSectionResult);
-                FailureMechanismSectionAssemblyCategoryGroup combinedAssembly =
-                    StabilityStoneCoverFailureMechanismAssemblyFactory.AssembleCombinedAssessment(failureMechanismSectionResult);
-
                 exportableResults.Add(
                     new ExportableAggregatedFailureMechanismSectionAssemblyResult(
                         failureMechanismSectionPair.Value,
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs
===================================================================
diff -u -rbecb20be0283702deba5ab628e9150e9c749e130 -rd4f68e1d5c93d481cbc3adfd16c54e32f8751961
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs)	(revision becb20be0283702deba5ab628e9150e9c749e130)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs)	(revision d4f68e1d5c93d481cbc3adfd16c54e32f8751961)
@@ -25,9 +25,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Integration.IO.Assembly;
@@ -40,6 +37,8 @@
     [TestFixture]
     public class ExportableStabilityStoneCoverFailureMechanismFactoryTest
     {
+        private const FailureMechanismSectionAssemblyCategoryGroup expectedSectionAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.None;
+        
         [Test]
         public void CreateExportableFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException()
         {
@@ -112,74 +111,28 @@
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
             FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(2, 10));
 
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
-                FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
+            // Call
+            ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult> exportableFailureMechanism =
+                ExportableStabilityStoneCoverFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
 
-                // Call
-                ExportableFailureMechanism<ExportableFailureMechanismAssemblyResult> exportableFailureMechanism =
-                    ExportableStabilityStoneCoverFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
+            // Assert
+            Assert.AreEqual(ExportableFailureMechanismType.ZST, exportableFailureMechanism.Code);
+            Assert.AreEqual(ExportableFailureMechanismGroup.Group3, exportableFailureMechanism.Group);
 
-                // Assert
-                Assert.AreEqual(ExportableFailureMechanismType.ZST, exportableFailureMechanism.Code);
-                Assert.AreEqual(ExportableFailureMechanismGroup.Group3, exportableFailureMechanism.Group);
+            ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
-                ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-                Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory);
-                Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
+            IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults
+                                                                                                                          .Select(sar => sar.FailureMechanismSection);
+            ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections);
+            AssertExportableFailureMechanismSectionResults(exportableFailureMechanismSections,
+                                                           exportableFailureMechanism.SectionAssemblyResults.Cast<ExportableAggregatedFailureMechanismSectionAssemblyResult>());
 
-                IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults
-                                                                                                                              .Select(sar => sar.FailureMechanismSection);
-                ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections);
-                AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group,
-                                                               failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value,
-                                                               failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value,
-                                                               failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value,
-                                                               exportableFailureMechanismSections,
-                                                               exportableFailureMechanism.SectionAssemblyResults.Cast<ExportableAggregatedFailureMechanismSectionAssemblyResult>());
-            }
-
             mocks.VerifyAll();
         }
 
-        [Test]
-        public void CreateExportableFailureMechanism_WithFailureMechanismWithManualAssessment_ManualAssemblyIgnored()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            FailureMechanismTestHelper.AddSections(failureMechanism, 1);
-            StabilityStoneCoverFailureMechanismSectionResultOld sectionResult = failureMechanism.SectionResultsOld.Single();
-            sectionResult.UseManualAssembly = true;
-            sectionResult.ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIIv;
-
-            using (new AssemblyToolCalculatorFactoryConfigOld())
-            {
-                var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance;
-                FailureMechanismAssemblyCalculatorOldStub failureMechanismAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismAssemblyCalculator;
-                FailureMechanismSectionAssemblyCalculatorOldStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
-
-                // Call
-                ExportableStabilityStoneCoverFailureMechanismFactory.CreateExportableFailureMechanism(failureMechanism, assessmentSection);
-
-                // Assert
-                Assert.AreEqual(failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput,
-                                failureMechanismAssemblyCalculator.FailureMechanismSectionCategories.Single());
-            }
-
-            mocks.VerifyAll();
-        }
-
-        private static void AssertExportableFailureMechanismSectionResults(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly,
-                                                                           FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly,
-                                                                           FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly,
-                                                                           FailureMechanismSectionAssemblyCategoryGroup expectedCombinedAssembly,
-                                                                           IEnumerable<ExportableFailureMechanismSection> sections,
+        private static void AssertExportableFailureMechanismSectionResults(IEnumerable<ExportableFailureMechanismSection> sections,
                                                                            IEnumerable<ExportableAggregatedFailureMechanismSectionAssemblyResult> results)
         {
             int expectedNrOfResults = sections.Count();
@@ -190,37 +143,29 @@
                 ExportableFailureMechanismSection section = sections.ElementAt(i);
                 ExportableAggregatedFailureMechanismSectionAssemblyResult result = results.ElementAt(i);
 
-                AssertExportableFailureMechanismSectionResult(expectedSimpleAssembly,
-                                                              expectedDetailedAssembly,
-                                                              expectedTailorMadeAssembly,
-                                                              expectedCombinedAssembly,
-                                                              section,
+                AssertExportableFailureMechanismSectionResult(section,
                                                               result);
             }
         }
 
-        private static void AssertExportableFailureMechanismSectionResult(FailureMechanismSectionAssemblyCategoryGroup expectedSimpleAssembly,
-                                                                          FailureMechanismSectionAssemblyCategoryGroup expectedDetailedAssembly,
-                                                                          FailureMechanismSectionAssemblyCategoryGroup expectedTailorMadeAssembly,
-                                                                          FailureMechanismSectionAssemblyCategoryGroup expectedCombinedAssembly,
-                                                                          ExportableFailureMechanismSection expectedSection,
+        private static void AssertExportableFailureMechanismSectionResult(ExportableFailureMechanismSection expectedSection,
                                                                           ExportableAggregatedFailureMechanismSectionAssemblyResult actualResult)
         {
             Assert.AreSame(expectedSection, actualResult.FailureMechanismSection);
 
-            ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedSimpleAssembly,
+            ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedSectionAssemblyCategoryGroup,
                                                                                             ExportableAssemblyMethod.WBI0E3,
                                                                                             actualResult.SimpleAssembly);
 
-            ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedDetailedAssembly,
+            ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedSectionAssemblyCategoryGroup,
                                                                                             ExportableAssemblyMethod.WBI0G6,
                                                                                             actualResult.DetailedAssembly);
 
-            ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedTailorMadeAssembly,
+            ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedSectionAssemblyCategoryGroup,
                                                                                             ExportableAssemblyMethod.WBI0T4,
                                                                                             actualResult.TailorMadeAssembly);
 
-            ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedCombinedAssembly,
+            ExportableSectionAssemblyResultTestHelper.AssertExportableSectionAssemblyResult(expectedSectionAssemblyCategoryGroup,
                                                                                             ExportableAssemblyMethod.WBI0A1,
                                                                                             actualResult.CombinedAssembly);
         }