Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs
===================================================================
diff -u -rbafb4d318466dac452919c07593591fb50f3ea60 -r34e4c2e5d4b673e604975119f441343a5ee95761
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs	(.../HydraulicBoundaryCalculationsView.cs)	(revision bafb4d318466dac452919c07593591fb50f3ea60)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs	(.../HydraulicBoundaryCalculationsView.cs)	(revision 34e4c2e5d4b673e604975119f441343a5ee95761)
@@ -37,7 +37,7 @@
     /// Base view for <see cref="HydraulicBoundaryLocationCalculation"/> views which should be derived in
     /// order to get a consistent look and feel.
     /// </summary>
-    public abstract partial class HydraulicBoundaryCalculationsView : LocationCalculationsView<HydraulicBoundaryLocationCalculation>
+    public abstract partial class HydraulicBoundaryCalculationsView : LocationCalculationsView
     {
         private readonly Observer calculationsObserver;
         private readonly RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> calculationObserver;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.Designer.cs
===================================================================
diff -u -r87f2b64cb6bdc1be2f6596d14bf4945e0ed418ac -r34e4c2e5d4b673e604975119f441343a5ee95761
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.Designer.cs	(.../LocationCalculationsView.Designer.cs)	(revision 87f2b64cb6bdc1be2f6596d14bf4945e0ed418ac)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.Designer.cs	(.../LocationCalculationsView.Designer.cs)	(revision 34e4c2e5d4b673e604975119f441343a5ee95761)
@@ -23,7 +23,7 @@
 
 namespace Riskeer.Common.Forms.Views
 {
-    partial class LocationCalculationsView<T>
+    partial class LocationCalculationsView
     {
         /// <summary> 
         /// Required designer variable.
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.cs
===================================================================
diff -u -rbafb4d318466dac452919c07593591fb50f3ea60 -r34e4c2e5d4b673e604975119f441343a5ee95761
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.cs	(.../LocationCalculationsView.cs)	(revision bafb4d318466dac452919c07593591fb50f3ea60)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/LocationCalculationsView.cs	(.../LocationCalculationsView.cs)	(revision 34e4c2e5d4b673e604975119f441343a5ee95761)
@@ -39,8 +39,7 @@
     /// <summary>
     /// Base view for selecting and performing hydraulic boundary location calculations.
     /// </summary>
-    /// <typeparam name="T">The type of the calculation objects.</typeparam>
-    public abstract partial class LocationCalculationsView<T> : UserControl, ISelectionProvider, IView where T : class
+    public abstract partial class LocationCalculationsView : UserControl, ISelectionProvider, IView
     {
         private const int calculateColumnIndex = 0;
 
@@ -53,7 +52,7 @@
         public event EventHandler<EventArgs> SelectionChanged;
 
         /// <summary>
-        /// Creates a new instance of <see cref="LocationCalculationsView{T}"/>.
+        /// Creates a new instance of <see cref="LocationCalculationsView"/>.
         /// </summary>
         protected LocationCalculationsView(IObservableEnumerable<HydraulicBoundaryLocationCalculation> calculations,
                                            IAssessmentSection assessmentSection)
@@ -87,9 +86,9 @@
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="IAssessmentSection"/>.
+        /// Gets the <see cref="IAssessmentSection"/>.
         /// </summary>
-        public IAssessmentSection AssessmentSection { get; protected set; }
+        public IAssessmentSection AssessmentSection { get; }
 
         /// <summary>
         /// Gets or sets the <see cref="IHydraulicBoundaryLocationCalculationGuiService"/>.
@@ -131,7 +130,7 @@
         /// </summary>
         protected virtual void InitializeDataGridView()
         {
-            dataGridViewControl.AddCheckBoxColumn(nameof(CalculatableRow<T>.ShouldCalculate),
+            dataGridViewControl.AddCheckBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.ShouldCalculate),
                                                   Resources.CalculatableView_Calculate);
             dataGridViewControl.AddCheckBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.IncludeIllustrationPoints),
                                                   Resources.HydraulicBoundaryLocationCalculationInput_IncludeIllustrationPoints_DisplayName);
@@ -173,20 +172,13 @@
                                       .Select(row => (CalculatableRow<HydraulicBoundaryLocationCalculation>) row.DataBoundItem);
         }
 
-        /// <summary>
-        /// Gets all the selected calculatable objects.
-        /// </summary>
         private IEnumerable<HydraulicBoundaryLocationCalculation> GetSelectedCalculatableObjects()
         {
             return GetCalculatableRows().Where(r => r.ShouldCalculate)
                                         .Select(r => r.CalculatableObject);
         }
-
-        /// <summary>
-        /// Handles the update of a hydraulic boundary location calculation by refreshing the data grid view
-        /// and updating the data of the illustration points control.
-        /// </summary>
-        protected void HandleHydraulicBoundaryLocationCalculationUpdate()
+        
+        private void HandleHydraulicBoundaryLocationCalculationUpdate()
         {
             suspendAllEvents = true;
             dataGridViewControl.RefreshDataGridView();