Index: Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs
===================================================================
diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rcac59383f988a0ae04b351f9e880910a35284947
--- Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs	(.../PropertyInfo.cs)	(revision 9383ddebb862ad6d2e18939d544c3710745a7e3f)
+++ Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs	(.../PropertyInfo.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -71,16 +71,6 @@
         public Func<object, bool> AdditionalDataCheck { get; set; }
 
         /// <summary>
-        /// Gets or sets the optional function that allows a data object to be converted 
-        /// to another data object that should be used as the property object instead.
-        /// </summary>
-        /// <example>
-        /// As an example, you could implement this as follows:
-        /// <code>var propertyInfo = new PropertyInfo &lt;ModelImplementation, ModelImplementationProperties&gt; { GetObjectPropertiesData = o =&gt; o.RunParameters };</code>
-        /// </example>
-        public Func<object, object> GetObjectPropertiesData { get; set; }
-
-        /// <summary>
         /// Gets or sets the optional function that allows for post-creation logic to be 
         /// executed on the newly created object properties. Function arguments:
         /// <list type="number">
@@ -156,16 +146,6 @@
         public Func<TObject, bool> AdditionalDataCheck { get; set; }
 
         /// <summary>
-        /// Gets or sets the optional function that allows a data object to be converted 
-        /// to another data object that should be used as the property object instead.
-        /// </summary>
-        /// <example>
-        /// As an example, you could implement this as follows:
-        /// <code>var propertyInfo = new PropertyInfo &lt;ModelImplementation, ModelImplementationProperties&gt; { GetObjectPropertiesData = o =&gt; o.RunParameters };</code>
-        /// </example>
-        public Func<TObject, object> GetObjectPropertiesData { get; set; }
-
-        /// <summary>
         /// Gets or sets the optional function that allows for post-creation logic to be 
         /// executed on the newly created object properties. Function arguments:
         /// <list type="number">
@@ -194,9 +174,6 @@
                 AdditionalDataCheck = propertyInfo.AdditionalDataCheck != null ?
                                           o => propertyInfo.AdditionalDataCheck((TObject) o) :
                                           (Func<object, bool>) null,
-                GetObjectPropertiesData = propertyInfo.GetObjectPropertiesData != null ?
-                                              o => propertyInfo.GetObjectPropertiesData((TObject) o) :
-                                              (Func<object, object>) null,
                 AfterCreate = propertyInfo.AfterCreate != null
                                   ? (p, o) => propertyInfo.AfterCreate((TProperty) p, (TObject) o)
                                   : (Action<IObjectProperties, object>) null
Index: Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs
===================================================================
diff -u -reabc096e1c5479dc95eca9434ebd88289b572462 -rcac59383f988a0ae04b351f9e880910a35284947
--- Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs	(.../PropertyInfoTest.cs)	(revision eabc096e1c5479dc95eca9434ebd88289b572462)
+++ Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs	(.../PropertyInfoTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -39,7 +39,6 @@
             Assert.IsNull(info.DataType);
             Assert.IsNull(info.PropertyObjectType);
             Assert.IsNull(info.AdditionalDataCheck);
-            Assert.IsNull(info.GetObjectPropertiesData);
             Assert.IsNull(info.AfterCreate);
         }
 
@@ -52,7 +51,6 @@
             var newDataType = typeof(object);
             var newPropertyObjectType = typeof(TestObjectProperties);
             Func<object, bool> newAdditionalDataDelegate = o => true;
-            Func<object, object> newGetObjectPropertiesDataDelegate = o => new object();
             Action<IObjectProperties, object> newAfterCreateDelegate = (properties, data) =>
             {
                 // Do something with the view
@@ -62,14 +60,12 @@
             info.DataType = newDataType;
             info.PropertyObjectType = newPropertyObjectType;
             info.AdditionalDataCheck = newAdditionalDataDelegate;
-            info.GetObjectPropertiesData = newGetObjectPropertiesDataDelegate;
             info.AfterCreate = newAfterCreateDelegate;
 
             // Assert
             Assert.AreEqual(newDataType, info.DataType);
             Assert.AreEqual(newPropertyObjectType, info.PropertyObjectType);
             Assert.AreEqual(newAdditionalDataDelegate, info.AdditionalDataCheck);
-            Assert.AreEqual(newGetObjectPropertiesDataDelegate, info.GetObjectPropertiesData);
             Assert.AreEqual(newAfterCreateDelegate, info.AfterCreate);
         }
 
@@ -83,7 +79,6 @@
             Assert.AreEqual(typeof(int), info.DataType);
             Assert.AreEqual(typeof(TestObjectProperties), info.PropertyObjectType);
             Assert.IsNull(info.AdditionalDataCheck);
-            Assert.IsNull(info.GetObjectPropertiesData);
             Assert.IsNull(info.AfterCreate);
         }
 
@@ -125,20 +120,17 @@
             var info = new PropertyInfo<int, TestObjectProperties>();
 
             Func<int, bool> newAdditionalDataDelegate = o => true;
-            Func<int, object> newGetObjectPropertiesDataDelegate = o => new object();
             Action<TestObjectProperties, int> newAfterCreateDelegate = (property, data) =>
             {
                 // Do something with the view
             };
 
             // Call
             info.AdditionalDataCheck = newAdditionalDataDelegate;
-            info.GetObjectPropertiesData = newGetObjectPropertiesDataDelegate;
             info.AfterCreate = newAfterCreateDelegate;
 
             // Assert
             Assert.AreEqual(newAdditionalDataDelegate, info.AdditionalDataCheck);
-            Assert.AreEqual(newGetObjectPropertiesDataDelegate, info.GetObjectPropertiesData);
             Assert.AreEqual(newAfterCreateDelegate, info.AfterCreate);
         }
 
@@ -158,14 +150,6 @@
                 additionalDataDelegateCalled = true;
                 return true;
             };
-            var alternativeObject = new object();
-            bool getObjectPropertiesDataDelegateCalled = false;
-            Func<int, object> newGetObjectPropertiesDataDelegate = o =>
-            {
-                Assert.AreEqual(inputData, o);
-                getObjectPropertiesDataDelegateCalled = true;
-                return alternativeObject;
-            };
             bool afterCreateDelegateCalled = false;
             Action<TestObjectProperties, int> newAfterCreateDelegate = (properties, data) =>
             {
@@ -175,7 +159,6 @@
             };
 
             info.AdditionalDataCheck = newAdditionalDataDelegate;
-            info.GetObjectPropertiesData = newGetObjectPropertiesDataDelegate;
             info.AfterCreate = newAfterCreateDelegate;
 
             // Precondition
@@ -193,10 +176,6 @@
             Assert.IsTrue(convertedInfo.AdditionalDataCheck(inputData));
             Assert.IsTrue(additionalDataDelegateCalled);
 
-            Assert.IsNotNull(convertedInfo.GetObjectPropertiesData);
-            Assert.AreSame(alternativeObject, convertedInfo.GetObjectPropertiesData(inputData));
-            Assert.IsTrue(getObjectPropertiesDataDelegateCalled);
-
             Assert.IsNotNull(convertedInfo.AfterCreate);
             convertedInfo.AfterCreate(testProperties, inputData);
             Assert.IsTrue(afterCreateDelegateCalled);
@@ -220,7 +199,6 @@
             Assert.AreEqual(typeof(TestObjectProperties), convertedInfo.PropertyObjectType);
 
             Assert.IsNull(convertedInfo.AdditionalDataCheck);
-            Assert.IsNull(convertedInfo.GetObjectPropertiesData);
             Assert.IsNull(convertedInfo.AfterCreate);
         }
 
Index: Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs
===================================================================
diff -u -rfe3a04f1e169f68031af3b1f412793f2459c04be -rcac59383f988a0ae04b351f9e880910a35284947
--- Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs	(.../MapPluginTest.cs)	(revision fe3a04f1e169f68031af3b1f412793f2459c04be)
+++ Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs	(.../MapPluginTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -128,31 +128,27 @@
                     typeof(MapDataCollection),
                     typeof(MapDataCollectionProperties));
                 Assert.IsNull(mapDataCollectionPropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(mapDataCollectionPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(mapDataCollectionPropertyInfo.AfterCreate);
 
                 PropertyInfo mapPointDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(MapPointData),
                     typeof(MapPointDataProperties));
                 Assert.IsNull(mapPointDataPropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(mapPointDataPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(mapPointDataPropertyInfo.AfterCreate);
 
                 PropertyInfo mapLineDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(MapLineData),
                     typeof(MapLineDataProperties));
                 Assert.IsNull(mapLineDataPropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(mapLineDataPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(mapLineDataPropertyInfo.AfterCreate);
 
                 PropertyInfo mapPolygonDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(MapPolygonData),
                     typeof(MapPolygonDataProperties));
                 Assert.IsNull(mapPolygonDataPropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(mapPolygonDataPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(mapPolygonDataPropertyInfo.AfterCreate);
             }
         }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs
===================================================================
diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rcac59383f988a0ae04b351f9e880910a35284947
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision 9383ddebb862ad6d2e18939d544c3710745a7e3f)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -73,7 +73,6 @@
                     propertyInfos,
                     typeof(ClosingStructuresFailureMechanismContext),
                     typeof(ClosingStructureFailureMechanismProperties));
-                Assert.IsNull(closingStructuresFailureMechanismContextPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(closingStructuresFailureMechanismContextPropertyInfo.AdditionalDataCheck);
                 Assert.IsNull(closingStructuresFailureMechanismContextPropertyInfo.AfterCreate);
 
@@ -82,15 +81,13 @@
                     typeof(ClosingStructure),
                     typeof(ClosingStructureProperties));
                 Assert.IsNull(closingStructurePropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(closingStructurePropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(closingStructurePropertyInfo.AfterCreate);
 
                 PropertyInfo closingStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ClosingStructuresInputContext),
                     typeof(ClosingStructuresInputContextProperties));
                 Assert.IsNull(closingStructuresInputContextPropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(closingStructuresInputContextPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(closingStructuresInputContextPropertyInfo.AfterCreate);
             }
             mocks.VerifyAll();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs
===================================================================
diff -u -r2aeb951ddc6e2137897569a2de4c55c9fb7e2420 -rcac59383f988a0ae04b351f9e880910a35284947
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs	(.../GrassCoverErosionInwardsPluginTest.cs)	(revision 2aeb951ddc6e2137897569a2de4c55c9fb7e2420)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs	(.../GrassCoverErosionInwardsPluginTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -64,31 +64,27 @@
                     typeof(GrassCoverErosionInwardsFailureMechanismContext),
                     typeof(GrassCoverErosionInwardsFailureMechanismContextProperties));
                 Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck);
-                Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(failureMechanismContextProperties.AfterCreate);
 
                 PropertyInfo dikeProfileProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(DikeProfile),
                     typeof(DikeProfileProperties));
                 Assert.IsNull(dikeProfileProperties.AdditionalDataCheck);
-                Assert.IsNull(dikeProfileProperties.GetObjectPropertiesData);
                 Assert.IsNull(dikeProfileProperties.AfterCreate);
 
                 PropertyInfo inputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionInwardsInputContext),
                     typeof(GrassCoverErosionInwardsInputContextProperties));
                 Assert.IsNull(inputContextProperties.AdditionalDataCheck);
-                Assert.IsNull(inputContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(inputContextProperties.AfterCreate);
 
                 PropertyInfo outputProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(GrassCoverErosionInwardsOutput),
                     typeof(GrassCoverErosionInwardsOutputProperties));
                 Assert.IsNull(outputProperties.AdditionalDataCheck);
-                Assert.IsNull(outputProperties.GetObjectPropertiesData);
                 Assert.IsNull(outputProperties.AfterCreate);
             }
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs
===================================================================
diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rcac59383f988a0ae04b351f9e880910a35284947
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision 9383ddebb862ad6d2e18939d544c3710745a7e3f)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs	(.../HeightStructuresPluginTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -74,7 +74,6 @@
                     propertyInfos,
                     typeof(HeightStructuresFailureMechanismContext),
                     typeof(HeightStructuresFailureMechanismProperties));
-                Assert.IsNull(heightStructuresFailureMechanismContextPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(heightStructuresFailureMechanismContextPropertyInfo.AdditionalDataCheck);
                 Assert.IsNull(heightStructuresFailureMechanismContextPropertyInfo.AfterCreate);
 
@@ -83,15 +82,13 @@
                     typeof(HeightStructure),
                     typeof(HeightStructureProperties));
                 Assert.IsNull(heightStructurePropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(heightStructurePropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(heightStructurePropertyInfo.AfterCreate);
 
                 PropertyInfo heightStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(HeightStructuresInputContext),
                     typeof(HeightStructuresInputContextProperties));
                 Assert.IsNull(heightStructuresInputContextPropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(heightStructuresInputContextPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(heightStructuresInputContextPropertyInfo.AfterCreate);
             }
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionPropertyInfoTest.cs
===================================================================
diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rcac59383f988a0ae04b351f9e880910a35284947
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionPropertyInfoTest.cs	(.../FailureMechanismContributionPropertyInfoTest.cs)	(revision 9383ddebb862ad6d2e18939d544c3710745a7e3f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionPropertyInfoTest.cs	(.../FailureMechanismContributionPropertyInfoTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -56,7 +56,6 @@
         {
             // Assert
             Assert.IsNull(info.AdditionalDataCheck);
-            Assert.IsNull(info.GetObjectPropertiesData);
             Assert.IsNotNull(info.AfterCreate);
             Assert.AreEqual(typeof(FailureMechanismContributionContext), info.DataType);
             Assert.AreEqual(typeof(FailureMechanismContributionProperties), info.PropertyObjectType);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rcac59383f988a0ae04b351f9e880910a35284947
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 9383ddebb862ad6d2e18939d544c3710745a7e3f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -207,103 +207,90 @@
                     typeof(IProject),
                     typeof(RingtoetsProjectProperties));
                 Assert.IsNull(ringtoetsProjectProperties.AdditionalDataCheck);
-                Assert.IsNull(ringtoetsProjectProperties.GetObjectPropertiesData);
                 Assert.IsNull(ringtoetsProjectProperties.AfterCreate);
 
                 PropertyInfo assessmentSectionProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(IAssessmentSection),
                     typeof(AssessmentSectionProperties));
                 Assert.IsNull(assessmentSectionProperties.AdditionalDataCheck);
-                Assert.IsNull(assessmentSectionProperties.GetObjectPropertiesData);
                 Assert.IsNull(assessmentSectionProperties.AfterCreate);
 
                 PropertyInfo hydraulicBoundaryDatabaseProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(HydraulicBoundaryDatabaseContext),
                     typeof(HydraulicBoundaryDatabaseProperties));
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.AdditionalDataCheck);
-                Assert.IsNull(hydraulicBoundaryDatabaseProperties.GetObjectPropertiesData);
                 Assert.IsNull(hydraulicBoundaryDatabaseProperties.AfterCreate);
 
                 PropertyInfo failureMechanismContributionProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(FailureMechanismContributionContext),
                     typeof(FailureMechanismContributionProperties));
                 Assert.IsNull(failureMechanismContributionProperties.AdditionalDataCheck);
-                Assert.IsNull(failureMechanismContributionProperties.GetObjectPropertiesData);
                 Assert.IsNotNull(failureMechanismContributionProperties.AfterCreate);
 
                 PropertyInfo standAloneFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(FailureMechanismContext<IFailureMechanism>),
                     typeof(StandAloneFailureMechanismContextProperties));
                 Assert.IsNull(standAloneFailureMechanismProperties.AdditionalDataCheck);
-                Assert.IsNull(standAloneFailureMechanismProperties.GetObjectPropertiesData);
                 Assert.IsNull(standAloneFailureMechanismProperties.AfterCreate);
 
                 PropertyInfo calculationGroupProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ICalculationContext<CalculationGroup, IFailureMechanism>),
                     typeof(CalculationGroupContextProperties));
                 Assert.IsNull(calculationGroupProperties.AdditionalDataCheck);
-                Assert.IsNull(calculationGroupProperties.GetObjectPropertiesData);
                 Assert.IsNull(calculationGroupProperties.AfterCreate);
 
                 PropertyInfo calculationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ICalculationContext<ICalculation, IFailureMechanism>),
                     typeof(CalculationContextProperties));
                 Assert.IsNull(calculationContextProperties.AdditionalDataCheck);
-                Assert.IsNull(calculationContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(calculationContextProperties.AfterCreate);
 
                 PropertyInfo outputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ProbabilityAssessmentOutput),
                     typeof(ProbabilityAssessmentOutputProperties));
                 Assert.IsNull(outputContextProperties.AdditionalDataCheck);
-                Assert.IsNull(outputContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(outputContextProperties.AfterCreate);
 
                 PropertyInfo designWaterLevelLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(DesignWaterLevelLocationsContext),
                     typeof(DesignWaterLevelLocationsContextProperties));
                 Assert.IsNull(designWaterLevelLocationsContextProperties.AdditionalDataCheck);
-                Assert.IsNull(designWaterLevelLocationsContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(designWaterLevelLocationsContextProperties.AfterCreate);
 
                 PropertyInfo designWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(DesignWaterLevelLocationContext),
                     typeof(DesignWaterLevelLocationContextProperties));
                 Assert.IsNull(designWaterLevelLocationContextProperties.AdditionalDataCheck);
-                Assert.IsNull(designWaterLevelLocationContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(designWaterLevelLocationContextProperties.AfterCreate);
 
                 PropertyInfo waveHeightLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(WaveHeightLocationsContext),
                     typeof(WaveHeightLocationsContextProperties));
                 Assert.IsNull(waveHeightLocationsContextProperties.AdditionalDataCheck);
-                Assert.IsNull(waveHeightLocationsContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(waveHeightLocationsContextProperties.AfterCreate);
 
                 PropertyInfo waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(WaveHeightLocationContext),
                     typeof(WaveHeightLocationContextProperties));
                 Assert.IsNull(waveHeightLocationContextProperties.AdditionalDataCheck);
-                Assert.IsNull(waveHeightLocationContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(waveHeightLocationContextProperties.AfterCreate);
 
                 PropertyInfo foreshoreProfileProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(ForeshoreProfile),
                     typeof(ForeshoreProfileProperties));
                 Assert.IsNull(foreshoreProfileProperties.AdditionalDataCheck);
-                Assert.IsNull(foreshoreProfileProperties.GetObjectPropertiesData);
                 Assert.IsNull(foreshoreProfileProperties.AfterCreate);
             }
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs
===================================================================
diff -u -r76095f14a847cd54fd958c5b326f7eb903dfd456 -rcac59383f988a0ae04b351f9e880910a35284947
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision 76095f14a847cd54fd958c5b326f7eb903dfd456)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs	(.../PipingPluginTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -75,47 +75,41 @@
                     typeof(PipingFailureMechanismContext),
                     typeof(PipingFailureMechanismContextProperties));
                 Assert.IsNull(pipingFailureMechanismContextProperties.AdditionalDataCheck);
-                Assert.IsNull(pipingFailureMechanismContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingFailureMechanismContextProperties.AfterCreate);
 
                 PropertyInfo pipingInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(PipingInputContext),
                     typeof(PipingInputContextProperties));
                 Assert.IsNull(pipingInputContextProperties.AdditionalDataCheck);
-                Assert.IsNull(pipingInputContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingInputContextProperties.AfterCreate);
 
                 PropertyInfo pipingOutputProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(PipingOutputContext),
                     typeof(PipingOutputContextProperties));
                 Assert.IsNull(pipingOutputProperties.AdditionalDataCheck);
-                Assert.IsNull(pipingOutputProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingOutputProperties.AfterCreate);
 
                 PropertyInfo pipingSurfaceLineProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(RingtoetsPipingSurfaceLine),
                     typeof(RingtoetsPipingSurfaceLineProperties));
                 Assert.IsNull(pipingSurfaceLineProperties.AdditionalDataCheck);
-                Assert.IsNull(pipingSurfaceLineProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingSurfaceLineProperties.AfterCreate);
 
                 PropertyInfo stochasticSoilModelProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StochasticSoilModel),
                     typeof(StochasticSoilModelProperties));
                 Assert.IsNull(stochasticSoilModelProperties.AdditionalDataCheck);
-                Assert.IsNull(stochasticSoilModelProperties.GetObjectPropertiesData);
                 Assert.IsNull(stochasticSoilModelProperties.AfterCreate);
 
                 PropertyInfo stochasticSoilProfileProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StochasticSoilProfile),
                     typeof(StochasticSoilProfileProperties));
                 Assert.IsNull(stochasticSoilProfileProperties.AdditionalDataCheck);
-                Assert.IsNull(stochasticSoilProfileProperties.GetObjectPropertiesData);
                 Assert.IsNull(stochasticSoilProfileProperties.AfterCreate);
 
                 mocks.VerifyAll();
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs
===================================================================
diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rcac59383f988a0ae04b351f9e880910a35284947
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision 9383ddebb862ad6d2e18939d544c3710745a7e3f)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs	(.../StabilityPointStructuresPluginTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -69,23 +69,20 @@
                     typeof(StabilityPointStructuresFailureMechanismContext),
                     typeof(StabilityPointStructuresFailureMechanismProperties));
                 Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck);
-                Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(failureMechanismContextProperties.AfterCreate);
 
                 PropertyInfo stabilityPointStructureProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StabilityPointStructure),
                     typeof(StabilityPointStructureProperties));
                 Assert.IsNull(stabilityPointStructureProperties.AdditionalDataCheck);
-                Assert.IsNull(stabilityPointStructureProperties.GetObjectPropertiesData);
                 Assert.IsNull(stabilityPointStructureProperties.AfterCreate);
 
                 PropertyInfo stabilityPointStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(StabilityPointStructuresInputContext),
                     typeof(StabilityPointStructuresInputContextProperties));
                 Assert.IsNull(stabilityPointStructuresInputContextPropertyInfo.AdditionalDataCheck);
-                Assert.IsNull(stabilityPointStructuresInputContextPropertyInfo.GetObjectPropertiesData);
                 Assert.IsNull(stabilityPointStructuresInputContextPropertyInfo.AfterCreate);
             }
         }
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs
===================================================================
diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -rcac59383f988a0ae04b351f9e880910a35284947
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs	(.../WaveImpactAsphaltCoverPluginTest.cs)	(revision cac59383f988a0ae04b351f9e880910a35284947)
@@ -72,15 +72,13 @@
                     typeof(WaveImpactAsphaltCoverWaveConditionsOutput),
                     typeof(WaveImpactAsphaltCoverWaveConditionsOutputProperties));
                 Assert.IsNull(waveImpactAsphaltCoverWaveConditionsOutputProperties.AdditionalDataCheck);
-                Assert.IsNull(waveImpactAsphaltCoverWaveConditionsOutputProperties.GetObjectPropertiesData);
                 Assert.IsNull(waveImpactAsphaltCoverWaveConditionsOutputProperties.AfterCreate);
 
                 PropertyInfo waveConditionsInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
                     propertyInfos,
                     typeof(WaveImpactAsphaltCoverWaveConditionsInputContext),
                     typeof(WaveImpactAsphaltCoverWaveConditionsInputContextProperties));
                 Assert.IsNull(waveConditionsInputContextProperties.AdditionalDataCheck);
-                Assert.IsNull(waveConditionsInputContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(waveConditionsInputContextProperties.AfterCreate);
             }
         }