Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r81a089a324a041488156e30757af098af062a391 -r68738cfb58ae2c7d0c876b2e429ca914859f480a
--- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 81a089a324a041488156e30757af098af062a391)
+++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 68738cfb58ae2c7d0c876b2e429ca914859f480a)
@@ -583,15 +583,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Categoriegrens {0}.
-        /// </summary>
-        public static string Hydraulic_category_boundary_0_ {
-            get {
-                return ResourceManager.GetString("Hydraulic_category_boundary_0_", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Hydraulische belastingen.
         /// </summary>
         public static string HydraulicBoundaryConditions_DisplayName {
Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx
===================================================================
diff -u -r81a089a324a041488156e30757af098af062a391 -r68738cfb58ae2c7d0c876b2e429ca914859f480a
--- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 81a089a324a041488156e30757af098af062a391)
+++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 68738cfb58ae2c7d0c876b2e429ca914859f480a)
@@ -411,9 +411,6 @@
   <data name="FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName" xml:space="preserve">
     <value>Vv</value>
   </data>
-  <data name="Hydraulic_category_boundary_0_" xml:space="preserve">
-    <value>Categoriegrens {0}</value>
-  </data>
   <data name="FailureMechanismAssemblyFactory_Error_while_assembling_failureMechanism" xml:space="preserve">
     <value>Voor een of meerdere vakken kan geen resultaat worden bepaald.</value>
   </data>
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rb854f931aec31b25745322c3bba0c3722950505b -r68738cfb58ae2c7d0c876b2e429ca914859f480a
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b854f931aec31b25745322c3bba0c3722950505b)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 68738cfb58ae2c7d0c876b2e429ca914859f480a)
@@ -2416,26 +2416,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De categoriegrens behorende bij het resultaat..
-        /// </summary>
-        public static string HydraulicBoundaryLocationCalculationOutputProperties_CategoryBoundaryName_Description {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryLocationCalculationOutputProperties_CategoryBoundaryName_Descrip" +
-                        "tion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Categoriegrens.
-        /// </summary>
-        public static string HydraulicBoundaryLocationCalculationOutputProperties_CategoryBoundaryName_DisplayName {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryLocationCalculationOutputProperties_CategoryBoundaryName_Display" +
-                        "Name", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Selecteer hydraulische belastingenlocaties.
         /// </summary>
         public static string HydraulicBoundaryLocationSelectionDialog_Select_HydraulicBoundaryLocations {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rb854f931aec31b25745322c3bba0c3722950505b -r68738cfb58ae2c7d0c876b2e429ca914859f480a
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision b854f931aec31b25745322c3bba0c3722950505b)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 68738cfb58ae2c7d0c876b2e429ca914859f480a)
@@ -1398,12 +1398,6 @@
   <data name="WaveHeightCalculation_Result_Description" xml:space="preserve">
     <value>Berekende golfhoogte.</value>
   </data>
-  <data name="HydraulicBoundaryLocationCalculationOutputProperties_CategoryBoundaryName_DisplayName" xml:space="preserve">
-    <value>Categoriegrens</value>
-  </data>
-  <data name="HydraulicBoundaryLocationCalculationOutputProperties_CategoryBoundaryName_Description" xml:space="preserve">
-    <value>De categoriegrens behorende bij het resultaat.</value>
-  </data>
   <data name="FailureMechanismSections_SourcePath_Description" xml:space="preserve">
     <value>De locatie van het bestand waaruit de vakindeling is geïmporteerd.</value>
   </data>
Fisheye: Tag 68738cfb58ae2c7d0c876b2e429ca914859f480a refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationCategoryBoundaryProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 68738cfb58ae2c7d0c876b2e429ca914859f480a refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationCategoryBoundaryProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 68738cfb58ae2c7d0c876b2e429ca914859f480a refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaveHeightCalculationCategoryBoundaryProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs
===================================================================
diff -u -r46db3bf684506a5debce4a61d9b6a7aac16b13cc -r68738cfb58ae2c7d0c876b2e429ca914859f480a
--- Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision 46db3bf684506a5debce4a61d9b6a7aac16b13cc)
+++ Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerPluginHelper.cs	(.../RiskeerPluginHelper.cs)	(revision 68738cfb58ae2c7d0c876b2e429ca914859f480a)
@@ -19,10 +19,10 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Controls.Views;
+using Core.Gui.Plugin;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
@@ -95,23 +95,6 @@
             return failureMechanism != null && ReferenceEquals(view.FailureMechanism, failureMechanism);
         }
 
-        /// <summary>
-        /// Formats a category boundary name to its full display name.
-        /// </summary>
-        /// <param name="categoryBoundaryName">The name of the category boundary to format.</param>
-        /// <returns>The formatted category boundary name.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="categoryBoundaryName"/>
-        /// is <c>null</c>.</exception>
-        public static string FormatCategoryBoundaryName(string categoryBoundaryName)
-        {
-            if (categoryBoundaryName == null)
-            {
-                throw new ArgumentNullException(nameof(categoryBoundaryName));
-            }
-
-            return string.Format(RiskeerCommonDataResources.Hydraulic_category_boundary_0_, categoryBoundaryName);
-        }
-
         private static IEnumerable<ICalculation> GetCalculationsFromFailureMechanisms(object o)
         {
             var failureMechanism = o as IFailureMechanism;
Fisheye: Tag 68738cfb58ae2c7d0c876b2e429ca914859f480a refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationCategoryBoundaryPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 68738cfb58ae2c7d0c876b2e429ca914859f480a refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationCategoryBoundaryPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 68738cfb58ae2c7d0c876b2e429ca914859f480a refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/WaveHeightCalculationCategoryBoundaryPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r68738cfb58ae2c7d0c876b2e429ca914859f480a
--- Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs	(.../RiskeerPluginHelperTest.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Plugin.Test/RiskeerPluginHelperTest.cs	(.../RiskeerPluginHelperTest.cs)	(revision 68738cfb58ae2c7d0c876b2e429ca914859f480a)
@@ -19,45 +19,19 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Controls.Views;
 using NUnit.Framework;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.Views;
-using Riskeer.Common.Plugin;
 using Riskeer.Common.Plugin.TestUtil;
 
-namespace Riskeer.Common.Service.Test
+namespace Riskeer.Common.Plugin.Test
 {
     [TestFixture]
     public class RiskeerPluginHelperTest
     {
-        [Test]
-        public void FormatCategoryBoundaryName_CategoryBoundaryNameNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate call = () => RiskeerPluginHelper.FormatCategoryBoundaryName(null);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("categoryBoundaryName", paramName);
-        }
-
-        [Test]
-        public void FormatCategoryBoundaryName_WithCategoryBoundaryName_ReturnsExpectedValue()
-        {
-            // Setup
-            const string categoryBoundaryName = "A";
-
-            // Call
-            string formattedCategoryBoundaryName = RiskeerPluginHelper.FormatCategoryBoundaryName(categoryBoundaryName);
-
-            // Assert
-            Assert.AreEqual("Categoriegrens " + categoryBoundaryName, formattedCategoryBoundaryName);
-        }
-
         [TestFixture]
         public class ShouldCloseViewWithCalculationDataTest : ShouldCloseViewWithCalculationDataTester
         {
@@ -78,8 +52,6 @@
             {
                 public object Data { get; set; }
 
-                public string Text { get; set; }
-
                 public void Dispose()
                 {
                     // Nothing to dispose