Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs
===================================================================
diff -u -r79e08dab2ccc7817a35c79d422d6915c427ed908 -r9d13fc4925bbab28ecc91ed7754a391749e53e1c
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs	(.../AssemblyMapDataFeaturesFactory.cs)	(revision 79e08dab2ccc7817a35c79d422d6915c427ed908)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs	(.../AssemblyMapDataFeaturesFactory.cs)	(revision 9d13fc4925bbab28ecc91ed7754a391749e53e1c)
@@ -22,12 +22,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Util;
 using Core.Components.Gis.Features;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.Forms;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
+using Riskeer.Common.Forms.Helpers;
 using Riskeer.Common.Forms.Properties;
 using RiskeerCommonPrimitivesResources = Riskeer.Common.Primitives.Properties.Resources;
 
@@ -83,8 +82,7 @@
                 }
 
                 feature.MetaData[Resources.AssemblyGroup_DisplayName] =
-                    new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(
-                        DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(assemblyResult.AssemblyGroup)).DisplayName;
+                    FailureMechanismSectionAssemblyGroupDisplayHelper.GetAssemblyGroupDisplayName(assemblyResult.AssemblyGroup);
 
                 yield return feature;
             }
Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs
===================================================================
diff -u -r3192f0b781afb4da048556c46e1b78c4079d05e4 -r9d13fc4925bbab28ecc91ed7754a391749e53e1c
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs	(.../FailureMechanismTestHelper.cs)	(revision 3192f0b781afb4da048556c46e1b78c4079d05e4)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/FailureMechanismTestHelper.cs	(.../FailureMechanismTestHelper.cs)	(revision 9d13fc4925bbab28ecc91ed7754a391749e53e1c)
@@ -21,9 +21,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base.Geometry;
-using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.FailurePath;
 
@@ -59,18 +57,6 @@
             AddSections(failureMechanism, numberOfSections, new Point2D(-1, -1), new Point2D(15, 15));
         }
 
-        /// <summary>
-        /// Adds a number of failure mechanism sections to <paramref name="failureMechanism"/>
-        /// based on the <paramref name="referenceLine"/> geometry and <paramref name="numberOfSections"/>.
-        /// </summary>
-        /// <param name="referenceLine">The reference line to get the geometry from.</param>
-        /// <param name="failureMechanism">The failure mechanism to add sections to.</param>
-        /// <param name="numberOfSections">The number of sections to add to the <paramref name="failureMechanism"/>.</param>
-        public static void AddSectionsBasedOnReferenceLine(ReferenceLine referenceLine, IFailureMechanism failureMechanism, int numberOfSections)
-        {
-            AddSections(failureMechanism, numberOfSections, referenceLine.Points.First(), referenceLine.Points.Last());
-        }
-
         private static void AddSections(IFailureMechanism failureMechanism, int numberOfSections, Point2D startPoint, Point2D endPoint)
         {
             double endPointStepsX = (endPoint.X - startPoint.X) / numberOfSections;
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rdcf0daecff8fe9d5f20f78226b88a8da9f8f2c96 -r9d13fc4925bbab28ecc91ed7754a391749e53e1c
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFeaturesFactoryTest.cs	(.../AssemblyMapDataFeaturesFactoryTest.cs)	(revision dcf0daecff8fe9d5f20f78226b88a8da9f8f2c96)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFeaturesFactoryTest.cs	(.../AssemblyMapDataFeaturesFactoryTest.cs)	(revision 9d13fc4925bbab28ecc91ed7754a391749e53e1c)
@@ -23,16 +23,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.TestUtil;
-using Core.Common.Util;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.Forms;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.Factories;
+using Riskeer.Common.Forms.Helpers;
 
 namespace Riskeer.Common.Forms.Test.Factories
 {
@@ -127,8 +126,7 @@
             Assert.AreEqual(1, mapGeometries.Count());
             CollectionAssert.AreEqual(section.Points, mapGeometries.Single().PointCollections.First());
             Assert.AreEqual(1, mapFeature.MetaData.Keys.Count);
-            Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(
-                                DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(expectedAssemblyResult.AssemblyGroup)).DisplayName,
+            Assert.AreEqual(FailureMechanismSectionAssemblyGroupDisplayHelper.GetAssemblyGroupDisplayName(expectedAssemblyResult.AssemblyGroup),
                             mapFeature.MetaData["Duidingsklasse"]);
         }
     }