Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -29,7 +29,6 @@
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms.ProgressDialog;
 using Core.Common.Gui.Plugin;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
@@ -320,7 +319,7 @@
         {
             var parentContext = (HeightStructuresContext) parentData;
             var changedObservables = HeightStructuresDataSynchronizationService.RemoveStructure(parentContext.FailureMechanism,
-                                                                                                      nodeData);
+                                                                                                nodeData);
             foreach (IObservable observable in changedObservables)
             {
                 observable.NotifyObservers();
@@ -349,7 +348,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
                 new HeightStructuresContext(failureMechanism.HeightStructures, failureMechanism, assessmentSection),
-                new CommentContext(failureMechanism.InputComments)
+                failureMechanism.InputComments
             };
         }
 
@@ -360,15 +359,15 @@
                 new HeightStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext(failureMechanism.OutputComments)
+                failureMechanism.OutputComments
             };
         }
 
         private static object[] FailureMechanismDisabledChildNodeObjects(HeightStructuresFailureMechanismContext context)
         {
             return new object[]
             {
-                new CommentContext(context.WrappedData.NotRelevantComments)
+                context.WrappedData.NotRelevantComments
             };
         }
 
@@ -608,7 +607,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext(context.WrappedData.Comments),
+                context.WrappedData.Comments,
                 new HeightStructuresInputContext(context.WrappedData.InputParameters,
                                                  context.WrappedData,
                                                  context.FailureMechanism,