Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -rd77f0eae87afa15b1a5484d5ef7c54f952a04166 -r95fbef8816eaf4e0ba49506d237886a651b54e19
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 95fbef8816eaf4e0ba49506d237886a651b54e19)
@@ -110,7 +110,7 @@
             }
 
             return AggregatedHydraulicBoundaryLocationFactory.CreateAggregatedHydraulicBoundaryLocations(assessmentSection)
-                                                             .Select(CreateHydraulicBoundaryLocationFeature)
+                                                             .Select(HydraulicBoundaryLocationMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeature)
                                                              .ToArray();
         }
 
@@ -309,22 +309,6 @@
             return new MapFeature[0];
         }
 
-        private static MapFeature CreateHydraulicBoundaryLocationFeature(AggregatedHydraulicBoundaryLocation location)
-        {
-            MapFeature feature = RingtoetsMapDataFeaturesFactoryHelper.CreateSinglePointMapFeature(location.Location);
-            feature.MetaData[RingtoetsCommonUtilResources.MetaData_ID] = location.Id;
-            feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = location.Name;
-            feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedSignalingNorm] = location.WaterLevelCalculationForFactorizedSignalingNorm;
-            feature.MetaData[Resources.MetaData_WaterLevelCalculationForSignalingNorm] = location.WaterLevelCalculationForSignalingNorm;
-            feature.MetaData[Resources.MetaData_WaterLevelCalculationForLowerLimit] = location.WaterLevelCalculationForLowerLimitNorm;
-            feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedLowerLimit] = location.WaterLevelCalculationForFactorizedLowerLimitNorm;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedSignalingNorm] = location.WaveHeightCalculationForFactorizedSignalingNorm;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculationForSignalingNorm] = location.WaveHeightCalculationForSignalingNorm;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculationForLowerLimit] = location.WaveHeightCalculationForLowerLimitNorm;
-            feature.MetaData[Resources.MetaData_WaveHeightCalculationForFactorizedLowerLimit] = location.WaveHeightCalculationForFactorizedLowerLimitNorm;
-            return feature;
-        }
-
         private static MapCalculationData CreateMapCalculationData<TStructuresInput, TStructure>(
             StructuresCalculation<TStructuresInput> calculation)
             where TStructuresInput : StructuresInputBase<TStructure>, new()
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rd77f0eae87afa15b1a5484d5ef7c54f952a04166 -r95fbef8816eaf4e0ba49506d237886a651b54e19
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 95fbef8816eaf4e0ba49506d237886a651b54e19)
@@ -2341,78 +2341,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to h(C-&gt;D).
-        /// </summary>
-        public static string MetaData_WaterLevelCalculationForFactorizedLowerLimit {
-            get {
-                return ResourceManager.GetString("MetaData_WaterLevelCalculationForFactorizedLowerLimit", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to h(A+-&gt;A).
-        /// </summary>
-        public static string MetaData_WaterLevelCalculationForFactorizedSignalingNorm {
-            get {
-                return ResourceManager.GetString("MetaData_WaterLevelCalculationForFactorizedSignalingNorm", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to h(B-&gt;C).
-        /// </summary>
-        public static string MetaData_WaterLevelCalculationForLowerLimit {
-            get {
-                return ResourceManager.GetString("MetaData_WaterLevelCalculationForLowerLimit", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to h(A-&gt;B).
-        /// </summary>
-        public static string MetaData_WaterLevelCalculationForSignalingNorm {
-            get {
-                return ResourceManager.GetString("MetaData_WaterLevelCalculationForSignalingNorm", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hs(C-&gt;D).
-        /// </summary>
-        public static string MetaData_WaveHeightCalculationForFactorizedLowerLimit {
-            get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculationForFactorizedLowerLimit", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hs(A+-&gt;A).
-        /// </summary>
-        public static string MetaData_WaveHeightCalculationForFactorizedSignalingNorm {
-            get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculationForFactorizedSignalingNorm", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hs(B-&gt;C).
-        /// </summary>
-        public static string MetaData_WaveHeightCalculationForLowerLimit {
-            get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculationForLowerLimit", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hs(A-&gt;B).
-        /// </summary>
-        public static string MetaData_WaveHeightCalculationForSignalingNorm {
-            get {
-                return ResourceManager.GetString("MetaData_WaveHeightCalculationForSignalingNorm", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Er zijn geen kunstwerken beschikbaar om berekeningen voor te genereren..
         /// </summary>
         public static string No_Structures_to_generate_Calculations_for {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rd77f0eae87afa15b1a5484d5ef7c54f952a04166 -r95fbef8816eaf4e0ba49506d237886a651b54e19
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 95fbef8816eaf4e0ba49506d237886a651b54e19)
@@ -1311,30 +1311,6 @@
   <data name="FailureMechanismSectionProbabilityAssessment_N_Rounded_DisplayName" xml:space="preserve">
     <value>N* [-]</value>
   </data>
-  <data name="MetaData_WaterLevelCalculationForFactorizedSignalingNorm" xml:space="preserve">
-    <value>h(A+-&gt;A)</value>
-  </data>
-  <data name="MetaData_WaterLevelCalculationForSignalingNorm" xml:space="preserve">
-    <value>h(A-&gt;B)</value>
-  </data>
-  <data name="MetaData_WaterLevelCalculationForLowerLimit" xml:space="preserve">
-    <value>h(B-&gt;C)</value>
-  </data>
-  <data name="MetaData_WaterLevelCalculationForFactorizedLowerLimit" xml:space="preserve">
-    <value>h(C-&gt;D)</value>
-  </data>
-  <data name="MetaData_WaveHeightCalculationForFactorizedSignalingNorm" xml:space="preserve">
-    <value>Hs(A+-&gt;A)</value>
-  </data>
-  <data name="MetaData_WaveHeightCalculationForSignalingNorm" xml:space="preserve">
-    <value>Hs(A-&gt;B)</value>
-  </data>
-  <data name="MetaData_WaveHeightCalculationForLowerLimit" xml:space="preserve">
-    <value>Hs(B-&gt;C)</value>
-  </data>
-  <data name="MetaData_WaveHeightCalculationForFactorizedLowerLimit" xml:space="preserve">
-    <value>Hs(C-&gt;D)</value>
-  </data>
   <data name="FailureMechanism_ProbabilityAssessmentInput_A_Description" xml:space="preserve">
     <value>De parameter 'a' die gebruikt wordt voor het lengte-effect in berekening van de maximaal toelaatbare faalkans.</value>
   </data>