Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -35,7 +35,6 @@
 using Ringtoets.ClosingStructures.Forms.Views;
 using Ringtoets.ClosingStructures.IO;
 using Ringtoets.ClosingStructures.Service;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
@@ -312,7 +311,7 @@
         {
             return new object[]
             {
-                new CommentContext(closingStructuresFailureMechanismContext.WrappedData.NotRelevantComments)
+                closingStructuresFailureMechanismContext.WrappedData.NotRelevantComments
             };
         }
 
@@ -323,7 +322,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
                 new ClosingStructuresContext(failureMechanism.ClosingStructures, failureMechanism, assessmentSection),
-                new CommentContext(failureMechanism.InputComments)
+                failureMechanism.InputComments
             };
         }
 
@@ -334,7 +333,7 @@
                 new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext(failureMechanism.OutputComments)
+                failureMechanism.OutputComments
             };
         }
 
@@ -587,7 +586,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext(context.WrappedData.Comments),
+                context.WrappedData.Comments,
                 new ClosingStructuresInputContext(context.WrappedData.InputParameters,
                                                   context.WrappedData,
                                                   context.FailureMechanism,
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -146,8 +146,8 @@
             Assert.AreSame(failureMechanism, closingStructuresContext.FailureMechanism);
             Assert.AreSame(assessmentSectionStub, closingStructuresContext.AssessmentSection);
 
-            var inputCommentContext = (CommentContext) inputsFolder.Contents[3];
-            Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
+            var inputComment = (Comment) inputsFolder.Contents[3];
+            Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var calculationsFolder = (ClosingStructuresCalculationGroupContext) children[1];
             Assert.AreEqual("Berekeningen", calculationsFolder.WrappedData.Name);
@@ -167,8 +167,8 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
-            Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+            var outputComment = (Comment) outputsFolder.Contents[2];
+            Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
         [Test]
@@ -189,8 +189,8 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext) children[0];
-            Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(failureMechanism.NotRelevantComments, comment);
         }
 
         [Test]
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -45,7 +45,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.HydraRing.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -142,9 +141,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(calculationContext.WrappedData.Comments, comment);
 
             var closingStructuresInputContext = children[1] as ClosingStructuresInputContext;
             Assert.IsNotNull(closingStructuresInputContext);
@@ -173,9 +171,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(calculationContext.WrappedData.Comments, comment);
 
             var closingStructuresInputContext = children[1] as ClosingStructuresInputContext;
             Assert.IsNotNull(closingStructuresInputContext);
Fisheye: Tag d72a7a2a430e8adaaf5357c10feb66e1f715d3b6 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CommentContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r603abf1f7f49b0ed6d179e7dd800a170048f477d -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 603abf1f7f49b0ed6d179e7dd800a170048f477d)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -53,7 +53,6 @@
     <Compile Include="IScenarioRow.cs" />
     <Compile Include="PresentationObjects\ForeshoreProfilesContext.cs" />
     <Compile Include="PresentationObjects\ICalculationContext.cs" />
-    <Compile Include="PresentationObjects\CommentContext.cs" />
     <Compile Include="PresentationObjects\CategoryTreeFolder.cs" />
     <Compile Include="PresentationObjects\FailureMechanismContext.cs">
       <SubType>Code</SubType>
Fisheye: Tag d72a7a2a430e8adaaf5357c10feb66e1f715d3b6 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CommentContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r603abf1f7f49b0ed6d179e7dd800a170048f477d -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 603abf1f7f49b0ed6d179e7dd800a170048f477d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -66,7 +66,6 @@
     <Compile Include="GuiServices\HydraulicBoundaryLocationCalculationGuiServiceTest.cs" />
     <Compile Include="Helpers\NamingHelperTest.cs" />
     <Compile Include="Helpers\ProbabilityFormattingHelperTest.cs" />
-    <Compile Include="PresentationObjects\CommentContextTest.cs" />
     <Compile Include="PresentationObjects\InputContextBaseTest.cs" />
     <Compile Include="PresentationObjects\FailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\CategoryTreeFolderTest.cs" />
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -28,7 +28,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.DikeProfiles;
@@ -350,7 +349,7 @@
         {
             return new object[]
             {
-                new CommentContext(grassCoverErosionInwardsFailureMechanismContext.WrappedData.NotRelevantComments)
+                grassCoverErosionInwardsFailureMechanismContext.WrappedData.NotRelevantComments
             };
         }
 
@@ -360,7 +359,7 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new DikeProfilesContext(failureMechanism.DikeProfiles, failureMechanism, assessmentSection),
-                new CommentContext(failureMechanism.InputComments)
+                failureMechanism.InputComments
             };
         }
 
@@ -371,7 +370,7 @@
                 new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<GrassCoverErosionInwardsFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext(failureMechanism.OutputComments)
+                failureMechanism.OutputComments
             };
         }
 
@@ -610,7 +609,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext(context.WrappedData.Comments),
+                context.WrappedData.Comments,
                 new GrassCoverErosionInwardsInputContext(context.WrappedData.InputParameters,
                                                          context.WrappedData,
                                                          context.FailureMechanism,
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -42,7 +42,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Plugin;
@@ -129,9 +128,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(calculationContext.WrappedData.Comments, comment);
 
             var grassCoverErosionInwardsInputContext = children[1] as GrassCoverErosionInwardsInputContext;
             Assert.IsNotNull(grassCoverErosionInwardsInputContext);
@@ -160,9 +158,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(calculationContext.WrappedData.Comments, comment);
 
             var grassCoverErosionInwardsInputContext = children[1] as GrassCoverErosionInwardsInputContext;
             Assert.IsNotNull(grassCoverErosionInwardsInputContext);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -132,8 +132,8 @@
             Assert.AreSame(failureMechanism, dikeProfilesContext.ParentFailureMechanism);
             Assert.AreSame(assessmentSectionMock, dikeProfilesContext.ParentAssessmentSection);
 
-            var inputCommentContext = (CommentContext) inputsFolder.Contents[2];
-            Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
+            var inputComment = (Comment) inputsFolder.Contents[2];
+            Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var calculationsFolder = (GrassCoverErosionInwardsCalculationGroupContext) children[1];
             Assert.AreEqual("Berekeningen", calculationsFolder.WrappedData.Name);
@@ -153,8 +153,8 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
-            Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+            var outputComment = (Comment) outputsFolder.Contents[2];
+            Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
         [Test]
@@ -175,8 +175,8 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext) children[0];
-            Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(failureMechanism.NotRelevantComments, comment);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -31,7 +31,6 @@
 using Core.Common.Gui.Forms.ProgressDialog;
 using Core.Common.Gui.Plugin;
 using log4net;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Forms;
@@ -402,7 +401,7 @@
         {
             return new object[]
             {
-                new CommentContext(failureMechanismContext.WrappedData.NotRelevantComments)
+                failureMechanismContext.WrappedData.NotRelevantComments
             };
         }
 
@@ -412,7 +411,7 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
-                new CommentContext(failureMechanism.InputComments)
+                failureMechanism.InputComments
             };
         }
 
@@ -422,7 +421,7 @@
             {
                 new FailureMechanismSectionResultContext<GrassCoverErosionOutwardsFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext(failureMechanism.OutputComments)
+                failureMechanism.OutputComments
             };
         }
 
@@ -807,7 +806,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext(context.WrappedData.Comments),
+                context.WrappedData.Comments,
                 new GrassCoverErosionOutwardsWaveConditionsInputContext(context.WrappedData.InputParameters,
                                                                         context.FailureMechanism)
             };
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -199,8 +199,8 @@
             Assert.AreSame(failureMechanism, foreshoreProfilesContext.ParentFailureMechanism);
             Assert.AreSame(assessmentSection, foreshoreProfilesContext.ParentAssessmentSection);
 
-            var inputCommentContext = (CommentContext)inputsFolder.Contents[2];
-            Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
+            var inputComment = (Comment) inputsFolder.Contents[2];
+            Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var hydraulicBoundariesGroupContext = (HydraulicBoundariesGroupContext) children[1];
             Assert.AreSame(failureMechanism.HydraulicBoundaryLocations, hydraulicBoundariesGroupContext.WrappedData);
@@ -217,8 +217,8 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext)outputsFolder.Contents[1];
-            Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+            var outputComment = (Comment) outputsFolder.Contents[1];
+            Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
         [Test]
@@ -240,8 +240,8 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext) children[0];
-            Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(failureMechanism.NotRelevantComments, comment);
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -42,7 +42,6 @@
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Plugin;
@@ -341,8 +340,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext) children[0];
-            Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(calculation.Comments, comment);
 
             var inputContext = (GrassCoverErosionOutwardsWaveConditionsInputContext) children[1];
             Assert.AreSame(calculation.InputParameters, inputContext.WrappedData);
@@ -405,8 +404,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext) children[0];
-            Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(calculation.Comments, comment);
 
             var inputContext = (GrassCoverErosionOutwardsWaveConditionsInputContext) children[1];
             Assert.AreSame(calculation.InputParameters, inputContext.WrappedData);
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,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -41,7 +41,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
@@ -129,9 +128,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(calculationContext.WrappedData.Comments, comment);
 
             var heightStructuresInputContext = children[1] as HeightStructuresInputContext;
             Assert.IsNotNull(heightStructuresInputContext);
@@ -161,9 +159,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(calculationContext.WrappedData.Comments, comment);
 
             var heightStructuresInputContext = children[1] as HeightStructuresInputContext;
             Assert.IsNotNull(heightStructuresInputContext);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -138,8 +138,8 @@
             Assert.AreSame(failureMechanism, heightStructuresContext.FailureMechanism);
             Assert.AreSame(assessmentSectionStub, heightStructuresContext.AssessmentSection);
 
-            var inputCommentContext = (CommentContext) inputsFolder.Contents[3];
-            Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
+            var inputComment = (Comment) inputsFolder.Contents[3];
+            Assert.AreSame(failureMechanism.InputComments, inputComment);
 
             var calculationsFolder = (HeightStructuresCalculationGroupContext) children[1];
             Assert.AreEqual("Berekeningen", calculationsFolder.WrappedData.Name);
@@ -159,8 +159,8 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
-            Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+            var outputComment = (Comment) outputsFolder.Contents[2];
+            Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
         [Test]
@@ -181,8 +181,8 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext) children[0];
-            Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(failureMechanism.NotRelevantComments, comment);
         }
 
         [Test]
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -390,10 +390,10 @@
                 MacrostabilityOutwardsFailureMechanismSectionResult,
                 MacrostabilityOutwardsResultView>();
 
-            yield return new ViewInfo<CommentContext, Comment, CommentView>
+            yield return new ViewInfo<Comment, CommentView>
             {
                 GetViewName = (view, context) => RingtoetsIntegrationPluginResources.Comment_DisplayName,
-                GetViewData = context => context.WrappedData,
+                GetViewData = context => context,
                 Image = RingtoetsCommonFormsResources.EditDocumentIcon,
                 CloseForData = CloseCommentViewForData
             };
@@ -648,7 +648,7 @@
             yield return CreateFailureMechanismSectionResultTreeNodeInfo<MacrostabilityInwardsFailureMechanismSectionResult>();
             yield return CreateFailureMechanismSectionResultTreeNodeInfo<MacrostabilityOutwardsFailureMechanismSectionResult>();
 
-            yield return new TreeNodeInfo<CommentContext>
+            yield return new TreeNodeInfo<Comment>
             {
                 Text = comment => RingtoetsIntegrationPluginResources.Comment_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.EditDocumentIcon,
@@ -1051,7 +1051,7 @@
                 new ReferenceLineContext(nodeData),
                 new FailureMechanismContributionContext(nodeData.FailureMechanismContribution, nodeData),
                 new HydraulicBoundaryDatabaseContext(nodeData),
-                new CommentContext(nodeData.Comments)
+                nodeData.Comments
             };
 
             IEnumerable<object> failureMechanismContexts = WrapFailureMechanismsInContexts(nodeData);
@@ -1120,7 +1120,7 @@
         {
             return new object[]
             {
-                new CommentContext(nodeData.WrappedData.NotRelevantComments)
+                nodeData.WrappedData.NotRelevantComments
             };
         }
 
@@ -1129,7 +1129,7 @@
             return new ArrayList
             {
                 new FailureMechanismSectionsContext(nodeData, assessmentSection),
-                new CommentContext(nodeData.InputComments)
+                nodeData.InputComments
             };
         }
 
@@ -1221,7 +1221,7 @@
                 failureMechanismSectionResultContexts[0] =
                     new FailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(stabilityPointConstruction.SectionResults, nodeData);
             }
-            failureMechanismSectionResultContexts[1] = new CommentContext(nodeData.OutputComments);
+            failureMechanismSectionResultContexts[1] = nodeData.OutputComments;
             return failureMechanismSectionResultContexts;
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -163,8 +163,8 @@
                 Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, context.WrappedData.HydraulicBoundaryDatabase);
                 Assert.AreSame(assessmentSection, context.WrappedData);
 
-                var commentContext = (CommentContext) objects[3];
-                Assert.AreSame(assessmentSection.Comments, commentContext.WrappedData);
+                var comment = (Comment) objects[3];
+                Assert.AreSame(assessmentSection.Comments, comment);
 
                 var pipingFailureMechanismContext = (PipingFailureMechanismContext) objects[4];
                 Assert.AreSame(assessmentSection.PipingFailureMechanism, pipingFailureMechanismContext.WrappedData);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -28,7 +28,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Plugin;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -56,7 +55,7 @@
                 var info = GetInfo(plugin);
 
                 // Assert
-                Assert.AreEqual(typeof(CommentContext), info.TagType);
+                Assert.AreEqual(typeof(Comment), info.TagType);
                 Assert.IsNull(info.EnsureVisibleOnCreate);
                 Assert.IsNull(info.ChildNodeObjects);
                 Assert.IsNull(info.CanRename);
@@ -85,10 +84,8 @@
             {
                 var info = GetInfo(plugin);
 
-                var context = new CommentContext(comment);
-
                 // Call
-                var text = info.Text(context);
+                var text = info.Text(comment);
 
                 // Assert
                 Assert.AreEqual("Opmerkingen", text);
@@ -104,10 +101,9 @@
             using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
-                var context = new CommentContext(comment);
 
                 // Call
-                var image = info.Image(context);
+                var image = info.Image(comment);
 
                 // Assert
                 TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.EditDocumentIcon, image);
@@ -146,7 +142,7 @@
 
         private TreeNodeInfo GetInfo(PluginBase gui)
         {
-            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(CommentContext));
+            return gui.GetTreeNodeInfos().First(tni => tni.TagType == typeof(Comment));
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -183,17 +183,15 @@
                 Assert.AreSame(failureMechanism, failureMechanismSectionsContext.WrappedData);
                 Assert.AreSame(assessmentSection, failureMechanismSectionsContext.ParentAssessmentSection);
 
-                var inputCommentContext = (CommentContext) inputFolder.Contents[1];
-                Assert.IsNotNull(inputCommentContext);
-                Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
+                var inputComment = (Comment) inputFolder.Contents[1];
+                Assert.AreSame(failureMechanism.InputComments, inputComment);
 
                 var outputFolder = (CategoryTreeFolder) children[1];
                 Assert.AreEqual("Oordeel", outputFolder.Name);
                 Assert.AreEqual(TreeFolderCategory.Output, outputFolder.Category);
 
-                var outputCommentContext = (CommentContext) outputFolder.Contents[0];
-                Assert.IsNotNull(outputCommentContext);
-                Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+                var outputComment = (Comment) outputFolder.Contents[0];
+                Assert.AreSame(failureMechanism.OutputComments, outputComment);
             }
             mocks.VerifyAll();
         }
@@ -259,8 +257,8 @@
 
                 // Assert
                 Assert.AreEqual(1, children.Length);
-                var commentContext = (CommentContext) children[0];
-                Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+                var comment = (Comment) children[0];
+                Assert.AreSame(failureMechanism.NotRelevantComments, comment);
             }
             mocks.VerifyAll();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -424,7 +424,6 @@
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
-                    typeof(CommentContext),
                     typeof(Comment),
                     typeof(CommentView));
             }
@@ -463,7 +462,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<WaterPressureAsphaltCoverFailureMechanismSectionResult>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<MacrostabilityOutwardsFailureMechanismSectionResult>)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext<MacrostabilityInwardsFailureMechanismSectionResult>)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CommentContext)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(Comment)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ProbabilityAssessmentOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyProbabilityAssessmentOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(RingtoetsProject)));
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -59,7 +59,7 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(CommentContext), info.DataType);
+            Assert.AreEqual(typeof(Comment), info.DataType);
         }
 
         [Test]
@@ -84,15 +84,12 @@
         {
             // Setup
             var comment = new Comment();
-            var contextMock = mocks.StrictMock<CommentContext>(comment);
-            mocks.ReplayAll();
 
             // Call
-            var viewData = info.GetViewData(contextMock);
+            var viewData = info.GetViewData(comment);
 
             // Assert
             Assert.AreSame(comment, viewData);
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -112,7 +109,7 @@
             var dataType = info.DataType;
 
             // Assert
-            Assert.AreEqual(typeof(CommentContext), dataType);
+            Assert.AreEqual(typeof(Comment), dataType);
         }
 
         [Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -30,7 +30,6 @@
 using Core.Common.Gui.Forms;
 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.Forms.Helpers;
@@ -581,7 +580,7 @@
         {
             return new object[]
             {
-                new CommentContext(pipingFailureMechanismContext.WrappedData.NotRelevantComments)
+                pipingFailureMechanismContext.WrappedData.NotRelevantComments
             };
         }
 
@@ -592,7 +591,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new RingtoetsPipingSurfaceLinesContext(failureMechanism.SurfaceLines, failureMechanism, assessmentSection),
                 new StochasticSoilModelsContext(failureMechanism.StochasticSoilModels, failureMechanism, assessmentSection),
-                new CommentContext(failureMechanism.InputComments)
+                failureMechanism.InputComments
             };
         }
 
@@ -603,7 +602,7 @@
                 new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<PipingFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext(failureMechanism.OutputComments)
+                failureMechanism.OutputComments
             };
         }
 
@@ -635,7 +634,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext(pipingCalculationScenarioContext.WrappedData.Comments),
+                pipingCalculationScenarioContext.WrappedData.Comments,
                 new PipingInputContext(pipingCalculationScenarioContext.WrappedData.InputParameters,
                                        pipingCalculationScenarioContext.WrappedData,
                                        pipingCalculationScenarioContext.AvailablePipingSurfaceLines,
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -39,7 +39,6 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
@@ -127,9 +126,8 @@
 
             // Assert
             Assert.AreEqual(3, children.Length);
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(pipingCalculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(pipingCalculationContext.WrappedData.Comments, comment);
 
             var pipingInputContext = (PipingInputContext) children[1];
             Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedData);
@@ -160,9 +158,8 @@
 
             // Assert
             Assert.AreEqual(3, children.Length);
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(pipingCalculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(pipingCalculationContext.WrappedData.Comments, comment);
 
             var pipingInputContext = (PipingInputContext) children[1];
             Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedData);
@@ -438,7 +435,7 @@
                 {
                     // When
                     var calculateContextMenuItemIndex = 1;
-                    Action action = () => contextMenuStrip.Items[calculateContextMenuItemIndex].PerformClick(); 
+                    Action action = () => contextMenuStrip.Items[calculateContextMenuItemIndex].PerformClick();
 
                     // Then
                     var expectedValidationMessageCount = 5;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -163,8 +163,8 @@
             Assert.AreSame(pipingFailureMechanism, stochasticSoilModelContext.FailureMechanism);
             Assert.AreSame(assessmentSection, stochasticSoilModelContext.AssessmentSection);
 
-            var inputCommentContext = (CommentContext) inputsFolder.Contents[3];
-            Assert.AreSame(pipingFailureMechanism.InputComments, inputCommentContext.WrappedData);
+            var comment = (Comment) inputsFolder.Contents[3];
+            Assert.AreSame(pipingFailureMechanism.InputComments, comment);
 
             var calculationsFolder = (PipingCalculationGroupContext) children[1];
             Assert.AreEqual("Berekeningen", calculationsFolder.WrappedData.Name);
@@ -186,8 +186,8 @@
             Assert.AreSame(pipingFailureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(pipingFailureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
-            Assert.AreSame(pipingFailureMechanism.OutputComments, outputCommentContext.WrappedData);
+            var commentContext = (Comment) outputsFolder.Contents[2];
+            Assert.AreSame(pipingFailureMechanism.OutputComments, commentContext);
         }
 
         [Test]
@@ -212,8 +212,8 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext) children[0];
-            Assert.AreSame(pipingFailureMechanism.NotRelevantComments, commentContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(pipingFailureMechanism.NotRelevantComments, comment);
         }
 
         [Test]
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -28,7 +28,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;
@@ -351,7 +350,7 @@
         {
             return new object[]
             {
-                new CommentContext(stabilityPointStructuresFailureMechanismContext.WrappedData.NotRelevantComments)
+                stabilityPointStructuresFailureMechanismContext.WrappedData.NotRelevantComments
             };
         }
 
@@ -363,7 +362,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
                 new StabilityPointStructuresContext(failureMechanism.StabilityPointStructures, failureMechanism, assessmentSection),
-                new CommentContext(failureMechanism.InputComments)
+                failureMechanism.InputComments
             };
         }
 
@@ -374,7 +373,7 @@
                 new StabilityPointStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism),
                 new FailureMechanismSectionResultContext<StabilityPointStructuresFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext(failureMechanism.OutputComments)
+                failureMechanism.OutputComments
             };
         }
 
@@ -616,7 +615,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext(context.WrappedData.Comments),
+                context.WrappedData.Comments,
                 new StabilityPointStructuresInputContext(context.WrappedData.InputParameters,
                                                          context.WrappedData,
                                                          context.FailureMechanism,
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -41,7 +41,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.StabilityPointStructures.Data;
@@ -128,9 +127,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(calculationContext.WrappedData.Comments, comment);
 
             var stabilityPointStructuresInputContext = children[1] as StabilityPointStructuresInputContext;
             Assert.IsNotNull(stabilityPointStructuresInputContext);
@@ -159,9 +157,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentContext = children[0] as CommentContext;
-            Assert.IsNotNull(commentContext);
-            Assert.AreSame(calculationContext.WrappedData.Comments, commentContext.WrappedData);
+            var comment = children[0] as Comment;
+            Assert.AreSame(calculationContext.WrappedData.Comments, comment);
 
             var stabilityPointStructuresInputContext = children[1] as StabilityPointStructuresInputContext;
             Assert.IsNotNull(stabilityPointStructuresInputContext);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -139,8 +139,8 @@
                 Assert.AreSame(failureMechanism, stabilityPointStructuresContext.FailureMechanism);
                 Assert.AreSame(assessmentSectionMock, stabilityPointStructuresContext.AssessmentSection);
 
-                var inputCommentContext = (CommentContext) inputsFolder.Contents[3];
-                Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
+                var inputComment = (Comment) inputsFolder.Contents[3];
+                Assert.AreSame(failureMechanism.InputComments, inputComment);
 
                 var calculationsFolder = (StabilityPointStructuresCalculationGroupContext) children[1];
                 Assert.AreEqual("Berekeningen", calculationsFolder.WrappedData.Name);
@@ -160,8 +160,8 @@
                 Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
                 Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-                var outputCommentContext = (CommentContext) outputsFolder.Contents[2];
-                Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+                var outputComment = (Comment) outputsFolder.Contents[2];
+                Assert.AreSame(failureMechanism.OutputComments, outputComment);
             }
             mocksRepository.VerifyAll();
         }
@@ -188,8 +188,8 @@
 
                 // Assert
                 Assert.AreEqual(1, children.Length);
-                var commentContext = (CommentContext) children[0];
-                Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+                var comment = (Comment) children[0];
+                Assert.AreSame(failureMechanism.NotRelevantComments, comment);
             }
             mocksRepository.VerifyAll();
         }
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -28,7 +28,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.Forms;
@@ -230,7 +229,7 @@
         {
             return new object[]
             {
-                new CommentContext(failureMechanismContext.WrappedData.NotRelevantComments)
+                failureMechanismContext.WrappedData.NotRelevantComments
             };
         }
 
@@ -240,7 +239,7 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
-                new CommentContext(failureMechanism.InputComments)
+                failureMechanism.InputComments
             };
         }
 
@@ -250,7 +249,7 @@
             {
                 new FailureMechanismSectionResultContext<StabilityStoneCoverFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext(failureMechanism.OutputComments)
+                failureMechanism.OutputComments
             };
         }
 
@@ -505,7 +504,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext(context.WrappedData.Comments),
+                context.WrappedData.Comments,
                 new StabilityStoneCoverWaveConditionsInputContext(context.WrappedData.InputParameters,
                                                                   context.FailureMechanism.ForeshoreProfiles,
                                                                   context.AssessmentSection)
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -199,8 +199,8 @@
             Assert.AreSame(failureMechanism, profilesContext.ParentFailureMechanism);
             Assert.AreSame(assessmentSection, profilesContext.ParentAssessmentSection);
 
-            var commentContext = (CommentContext) inputsFolder.Contents[2];
-            Assert.AreSame(failureMechanism.InputComments, commentContext.WrappedData);
+            var comment = (Comment) inputsFolder.Contents[2];
+            Assert.AreSame(failureMechanism.InputComments, comment);
 
             var hydraulicBoundariesCalculationGroup = (StabilityStoneCoverWaveConditionsCalculationGroupContext) children[1];
             Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, hydraulicBoundariesCalculationGroup.WrappedData);
@@ -215,8 +215,8 @@
             Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
             Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-            var outputCommentContext = (CommentContext) outputsFolder.Contents[1];
-            Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+            var outputComment = (Comment) outputsFolder.Contents[1];
+            Assert.AreSame(failureMechanism.OutputComments, outputComment);
         }
 
         [Test]
@@ -238,8 +238,8 @@
 
             // Assert
             Assert.AreEqual(1, children.Length);
-            var commentContext = (CommentContext) children[0];
-            Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(failureMechanism.NotRelevantComments, comment);
         }
 
         [Test]
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -42,7 +42,6 @@
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
@@ -192,8 +191,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext) children[0];
-            Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
+            var comments = (Comment) children[0];
+            Assert.AreSame(calculation.Comments, comments);
 
             var inputContext = (StabilityStoneCoverWaveConditionsInputContext) children[1];
             Assert.AreSame(calculation.InputParameters, inputContext.WrappedData);
@@ -253,8 +252,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext) children[0];
-            Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
+            var comment = (Comment) children[0];
+            Assert.AreSame(calculation.Comments, comment);
 
             var inputContext = (StabilityStoneCoverWaveConditionsInputContext) children[1];
             Assert.AreSame(calculation.InputParameters, inputContext.WrappedData);
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -28,7 +28,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.Forms;
@@ -233,7 +232,7 @@
         {
             return new object[]
             {
-                new CommentContext(failureMechanismContext.WrappedData.NotRelevantComments)
+                failureMechanismContext.WrappedData.NotRelevantComments
             };
         }
 
@@ -243,7 +242,7 @@
             {
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection),
-                new CommentContext(failureMechanism.InputComments)
+                failureMechanism.InputComments
             };
         }
 
@@ -253,7 +252,7 @@
             {
                 new FailureMechanismSectionResultContext<WaveImpactAsphaltCoverFailureMechanismSectionResult>(
                     failureMechanism.SectionResults, failureMechanism),
-                new CommentContext(failureMechanism.OutputComments)
+                failureMechanism.OutputComments
             };
         }
 
@@ -511,7 +510,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext(context.WrappedData.Comments),
+                context.WrappedData.Comments,
                 new WaveImpactAsphaltCoverWaveConditionsInputContext(context.WrappedData.InputParameters,
                                                                      context.FailureMechanism.ForeshoreProfiles,
                                                                      context.AssessmentSection)
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -42,7 +42,6 @@
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
@@ -192,8 +191,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext) children[0];
-            Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
+            var comments = (Comment) children[0];
+            Assert.AreSame(calculation.Comments, comments);
 
             var inputContext = (WaveImpactAsphaltCoverWaveConditionsInputContext) children[1];
             Assert.AreSame(calculation.InputParameters, inputContext.WrappedData);
@@ -251,8 +250,8 @@
             // Assert
             Assert.AreEqual(3, children.Length);
 
-            var commentsContext = (CommentContext) children[0];
-            Assert.AreSame(calculation.Comments, commentsContext.WrappedData);
+            var comments = (Comment) children[0];
+            Assert.AreSame(calculation.Comments, comments);
 
             var inputContext = (WaveImpactAsphaltCoverWaveConditionsInputContext) children[1];
             Assert.AreSame(calculation.InputParameters, inputContext.WrappedData);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc0d30f326bbc7308be94ba7a77ee37744cb7bee5 -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision c0d30f326bbc7308be94ba7a77ee37744cb7bee5)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs)	(revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
@@ -213,8 +213,8 @@
                 Assert.AreSame(failureMechanism, foreshoreProfilesContext.ParentFailureMechanism);
                 Assert.AreSame(assessmentSection, foreshoreProfilesContext.ParentAssessmentSection);
 
-                var inputCommentContext = (CommentContext) inputsFolder.Contents[2];
-                Assert.AreSame(failureMechanism.InputComments, inputCommentContext.WrappedData);
+                var inputComment = (Comment) inputsFolder.Contents[2];
+                Assert.AreSame(failureMechanism.InputComments, inputComment);
 
                 var hydraulicBoundariesCalculationGroup = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) children[1];
                 Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, hydraulicBoundariesCalculationGroup.WrappedData);
@@ -230,8 +230,8 @@
                 Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
                 Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
 
-                var outputCommentContext = (CommentContext) outputsFolder.Contents[1];
-                Assert.AreSame(failureMechanism.OutputComments, outputCommentContext.WrappedData);
+                var outputComment = (Comment) outputsFolder.Contents[1];
+                Assert.AreSame(failureMechanism.OutputComments, outputComment);
             }
         }
 
@@ -258,8 +258,8 @@
 
                 // Assert
                 Assert.AreEqual(1, children.Length);
-                var commentContext = (CommentContext) children[0];
-                Assert.AreSame(failureMechanism.NotRelevantComments, commentContext.WrappedData);
+                var comment = (Comment) children[0];
+                Assert.AreSame(failureMechanism.NotRelevantComments, comment);
             }
         }