Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rd4fb475f3f6e36b919118b6c1ed100ce45dbf356 -r810d2a004a428a8da86879af41a54b5d985cbd61
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision d4fb475f3f6e36b919118b6c1ed100ce45dbf356)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 810d2a004a428a8da86879af41a54b5d985cbd61)
@@ -735,8 +735,8 @@
             var inquiryHelper = new DialogBasedInquiryHelper(Gui.MainWindow);
 
             StructuresCalculation<ClosingStructuresInput> calculation = context.WrappedData;
-            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler<ClosingStructuresInput>(inquiryHelper,
-                                                                                                                  calculation);
+            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(inquiryHelper, calculation);
+
             var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl));
             return builder.AddExportItem()
                           .AddSeparator()
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs
===================================================================
diff -u -ra68f144ae66e3c768759bf16cc26dfca2e2aed49 -r810d2a004a428a8da86879af41a54b5d985cbd61
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandler.cs)	(revision a68f144ae66e3c768759bf16cc26dfca2e2aed49)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandler.cs)	(revision 810d2a004a428a8da86879af41a54b5d985cbd61)
@@ -28,13 +28,11 @@
     /// <summary>
     /// Class for handling clearing illustration point results from a structures calculation.
     /// </summary>
-    /// <typeparam name="TStructureInput">Object type of the structure calculation input.</typeparam>
-    public class ClearIllustrationPointsOfStructuresCalculationHandler<TStructureInput>
+    public class ClearIllustrationPointsOfStructuresCalculationHandler
         : ClearIllustrationPointsOfCalculationChangeHandlerBase<IStructuresCalculation>
-        where TStructureInput : IStructuresCalculationInput, new()
     {
         /// <summary>
-        /// Creates a new instance of <see cref="ClearIllustrationPointsOfStructuresCalculationHandler{TStructureInput}"/>.
+        /// Creates a new instance of <see cref="ClearIllustrationPointsOfStructuresCalculationHandler"/>.
         /// </summary>
         /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <param name="calculation">The calculation to clear the illustration points for.</param>
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs
===================================================================
diff -u -ra68f144ae66e3c768759bf16cc26dfca2e2aed49 -r810d2a004a428a8da86879af41a54b5d985cbd61
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs)	(revision a68f144ae66e3c768759bf16cc26dfca2e2aed49)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs)	(revision 810d2a004a428a8da86879af41a54b5d985cbd61)
@@ -44,7 +44,7 @@
             var calculation = new TestStructuresCalculation();
 
             // Call
-            var handler = new ClearIllustrationPointsOfStructuresCalculationHandler<TestStructuresInput>(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfStructuresCalculationHandler(inquiryHelper, calculation);
 
             // Assert
             Assert.IsInstanceOf<ClearIllustrationPointsOfCalculationChangeHandlerBase<StructuresCalculation<TestStructuresInput>>>(handler);
@@ -61,7 +61,7 @@
             var inquiryHelper = mocks.StrictMock<IInquiryHelper>();
             mocks.ReplayAll();
 
-            var handler = new ClearIllustrationPointsOfStructuresCalculationHandler<TestStructuresInput>(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfStructuresCalculationHandler(inquiryHelper, calculation);
 
             bool hasOutput = calculation.HasOutput;
 
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rd4fb475f3f6e36b919118b6c1ed100ce45dbf356 -r810d2a004a428a8da86879af41a54b5d985cbd61
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision d4fb475f3f6e36b919118b6c1ed100ce45dbf356)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 810d2a004a428a8da86879af41a54b5d985cbd61)
@@ -748,8 +748,7 @@
             var inquiryHelper = new DialogBasedInquiryHelper(Gui.MainWindow);
 
             StructuresCalculation<HeightStructuresInput> calculation = context.WrappedData;
-            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler<HeightStructuresInput>(inquiryHelper,
-                                                                                                                 calculation);
+            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(inquiryHelper, calculation);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl));
             return builder.AddExportItem()
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rd4fb475f3f6e36b919118b6c1ed100ce45dbf356 -r810d2a004a428a8da86879af41a54b5d985cbd61
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision d4fb475f3f6e36b919118b6c1ed100ce45dbf356)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 810d2a004a428a8da86879af41a54b5d985cbd61)
@@ -748,8 +748,7 @@
             var inquiryHelper = new DialogBasedInquiryHelper(Gui.MainWindow);
 
             StructuresCalculation<StabilityPointStructuresInput> calculation = context.WrappedData;
-            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler<StabilityPointStructuresInput>(inquiryHelper,
-                                                                                                                         calculation);
+            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(inquiryHelper, calculation);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl));
             return builder.AddExportItem()