Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs
===================================================================
diff -u -r540898bb1046a0815eb45d17bf6bf74264ae84c3 -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs	(.../ClosingStructuresInputContextProperties.cs)	(revision 540898bb1046a0815eb45d17bf6bf74264ae84c3)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs	(.../ClosingStructuresInputContextProperties.cs)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.Gui.Attributes;
 using Core.Common.Util;
@@ -36,7 +35,6 @@
 using Ringtoets.Common.Forms.ChangeHandlers;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TypeConverters;
-using Ringtoets.Common.Util;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Forms.PropertyClasses
@@ -138,30 +136,37 @@
                 {
                     return data.WrappedData.InflowModelType != ClosingStructureInflowModelType.VerticalWall;
                 }
+
                 if (propertyName == nameof(ModelFactorSuperCriticalFlow))
                 {
                     return data.WrappedData.InflowModelType != ClosingStructureInflowModelType.FloodedCulvert;
                 }
+
                 if (propertyName == nameof(DrainCoefficient))
                 {
                     return data.WrappedData.InflowModelType == ClosingStructureInflowModelType.FloodedCulvert;
                 }
+
                 if (propertyName == nameof(StructureNormalOrientation))
                 {
                     return data.WrappedData.InflowModelType == ClosingStructureInflowModelType.VerticalWall;
                 }
+
                 if (propertyName == nameof(ThresholdHeightOpenWeir))
                 {
                     return data.WrappedData.InflowModelType == ClosingStructureInflowModelType.LowSill;
                 }
+
                 if (propertyName == nameof(AreaFlowApertures))
                 {
                     return data.WrappedData.InflowModelType == ClosingStructureInflowModelType.FloodedCulvert;
                 }
+
                 if (propertyName == nameof(LevelCrestStructureNotClosing))
                 {
                     return data.WrappedData.InflowModelType == ClosingStructureInflowModelType.VerticalWall;
                 }
+
                 if (propertyName == nameof(WidthFlowApertures))
                 {
                     return data.WrappedData.InflowModelType != ClosingStructureInflowModelType.FloodedCulvert;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r540898bb1046a0815eb45d17bf6bf74264ae84c3 -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs	(.../ClosingStructuresCalculationConfigurationImporter.cs)	(revision 540898bb1046a0815eb45d17bf6bf74264ae84c3)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs	(.../ClosingStructuresCalculationConfigurationImporter.cs)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -33,7 +33,6 @@
 using Ringtoets.Common.IO.Configurations;
 using Ringtoets.Common.IO.Configurations.Helpers;
 using Ringtoets.Common.IO.Configurations.Import;
-using Ringtoets.Common.Util;
 using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.IO.Configurations
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Ringtoets.ClosingStructures.IO.csproj
===================================================================
diff -u -r29790fcc3f047bb06be903969805d70f0f125329 -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Ringtoets.ClosingStructures.IO.csproj	(.../Ringtoets.ClosingStructures.IO.csproj)	(revision 29790fcc3f047bb06be903969805d70f0f125329)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Ringtoets.ClosingStructures.IO.csproj	(.../Ringtoets.ClosingStructures.IO.csproj)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -59,11 +59,6 @@
       <Name>Ringtoets.Common.IO</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Util\Ringtoets.Common.Util.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Ringtoets.Common.Util</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureReplaceDataStrategy.cs
===================================================================
diff -u -ra8f322a9cea54ebf9134fdfd3cbb933456f25146 -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureReplaceDataStrategy.cs	(.../ClosingStructureReplaceDataStrategy.cs)	(revision a8f322a9cea54ebf9134fdfd3cbb933456f25146)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureReplaceDataStrategy.cs	(.../ClosingStructureReplaceDataStrategy.cs)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -21,14 +21,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Core.Common.Base;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Service;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.IO.Structures;
-using Ringtoets.Common.Service;
 
 namespace Ringtoets.ClosingStructures.Plugin.FileImporters
 {
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs
===================================================================
diff -u -r540898bb1046a0815eb45d17bf6bf74264ae84c3 -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs	(.../ClosingStructureUpdateDataStrategy.cs)	(revision 540898bb1046a0815eb45d17bf6bf74264ae84c3)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs	(.../ClosingStructureUpdateDataStrategy.cs)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -30,8 +30,6 @@
 using Ringtoets.Common.Data.UpdateDataStrategies;
 using Ringtoets.Common.Forms;
 using Ringtoets.Common.IO.Structures;
-using Ringtoets.Common.Service;
-using Ringtoets.Common.Util;
 
 namespace Ringtoets.ClosingStructures.Plugin.FileImporters
 {
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj
===================================================================
diff -u -r29790fcc3f047bb06be903969805d70f0f125329 -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj	(.../Ringtoets.ClosingStructures.Plugin.csproj)	(revision 29790fcc3f047bb06be903969805d70f0f125329)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj	(.../Ringtoets.ClosingStructures.Plugin.csproj)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -74,11 +74,6 @@
       <Name>Ringtoets.Common.Service</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Util\Ringtoets.Common.Util.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Ringtoets.Common.Util</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs
===================================================================
diff -u -r4efa41f677773d8691e656b015058f25a04aca15 -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs	(.../ClosingStructureReplaceDataStrategyTest.cs)	(revision 4efa41f677773d8691e656b015058f25a04aca15)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs	(.../ClosingStructureReplaceDataStrategyTest.cs)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -30,7 +30,6 @@
 using Ringtoets.ClosingStructures.Plugin.FileImporters;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Exceptions;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Data.UpdateDataStrategies;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj
===================================================================
diff -u -r29790fcc3f047bb06be903969805d70f0f125329 -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj	(.../Ringtoets.ClosingStructures.Plugin.Test.csproj)	(revision 29790fcc3f047bb06be903969805d70f0f125329)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj	(.../Ringtoets.ClosingStructures.Plugin.Test.csproj)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -102,10 +102,6 @@
       <Name>Ringtoets.Common.IO</Name>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Util\Ringtoets.Common.Util.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Ringtoets.Common.Util</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3c674596825cc7aba3f30fb0af4f14c0078cb46c -r0834dde2510012e42a23dbcb9b2886237c87a938
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 3c674596825cc7aba3f30fb0af4f14c0078cb46c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 0834dde2510012e42a23dbcb9b2886237c87a938)
@@ -39,66 +39,64 @@
     [TestFixture]
     public class ClosingStructuresProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest
     {
+        private ClosingStructuresPlugin plugin;
+        private TreeNodeInfo info;
+
+        [SetUp]
+        public void Setup()
+        {
+            plugin = new ClosingStructuresPlugin();
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>));
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
-            // Setup
-            using (var plugin = new ClosingStructuresPlugin())
-            {
-                TreeNodeInfo info = GetInfo(plugin);
-
-                // Assert
-                Assert.IsNotNull(info.Text);
-                Assert.IsNull(info.ForeColor);
-                Assert.IsNotNull(info.Image);
-                Assert.IsNotNull(info.ContextMenuStrip);
-                Assert.IsNull(info.EnsureVisibleOnCreate);
-                Assert.IsNull(info.ExpandOnCreate);
-                Assert.IsNull(info.ChildNodeObjects);
-                Assert.IsNull(info.CanRename);
-                Assert.IsNull(info.OnNodeRenamed);
-                Assert.IsNull(info.CanRemove);
-                Assert.IsNull(info.OnNodeRemoved);
-                Assert.IsNull(info.CanCheck);
-                Assert.IsNull(info.IsChecked);
-                Assert.IsNull(info.OnNodeChecked);
-                Assert.IsNull(info.CanDrag);
-                Assert.IsNull(info.CanDrop);
-                Assert.IsNull(info.CanInsert);
-                Assert.IsNull(info.OnDrop);
-            }
+            // Assert
+            Assert.IsNotNull(info.Text);
+            Assert.IsNull(info.ForeColor);
+            Assert.IsNotNull(info.Image);
+            Assert.IsNotNull(info.ContextMenuStrip);
+            Assert.IsNull(info.EnsureVisibleOnCreate);
+            Assert.IsNull(info.ExpandOnCreate);
+            Assert.IsNull(info.ChildNodeObjects);
+            Assert.IsNull(info.CanRename);
+            Assert.IsNull(info.OnNodeRenamed);
+            Assert.IsNull(info.CanRemove);
+            Assert.IsNull(info.OnNodeRemoved);
+            Assert.IsNull(info.CanCheck);
+            Assert.IsNull(info.IsChecked);
+            Assert.IsNull(info.OnNodeChecked);
+            Assert.IsNull(info.CanDrag);
+            Assert.IsNull(info.CanDrop);
+            Assert.IsNull(info.CanInsert);
+            Assert.IsNull(info.OnDrop);
         }
 
         [Test]
         public void Text_Always_ReturnsName()
         {
-            // Setup
-            using (var plugin = new ClosingStructuresPlugin())
-            {
-                TreeNodeInfo info = GetInfo(plugin);
+            // Call
+            string text = info.Text(null);
 
-                // Call
-                string text = info.Text(null);
-
-                // Assert
-                Assert.AreEqual("Resultaat", text);
-            }
+            // Assert
+            Assert.AreEqual("Resultaat", text);
         }
 
         [Test]
         public void Image_Always_ReturnsGenericInputOutputIcon()
         {
-            // Setup
-            using (var plugin = new ClosingStructuresPlugin())
-            {
-                TreeNodeInfo info = GetInfo(plugin);
+            // Call
+            Image image = info.Image(null);
 
-                // Call
-                Image image = info.Image(null);
-
-                // Assert
-                TestHelper.AssertImagesAreEqual(Resources.FailureMechanismSectionResultIcon, image);
-            }
+            // Assert
+            TestHelper.AssertImagesAreEqual(Resources.FailureMechanismSectionResultIcon, image);
         }
 
         [Test]
@@ -125,24 +123,14 @@
                 gui.Stub(g => g.Get(sectionResultContext, treeViewControl)).Return(menuBuilder);
                 mockRepository.ReplayAll();
 
-                using (var plugin = new ClosingStructuresPlugin())
-                {
-                    TreeNodeInfo info = GetInfo(plugin);
+                plugin.Gui = gui;
 
-                    plugin.Gui = gui;
-
-                    // Call
-                    info.ContextMenuStrip(sectionResultContext, null, treeViewControl);
-                }
+                // Call
+                info.ContextMenuStrip(sectionResultContext, null, treeViewControl);
             }
 
             // Assert
             mockRepository.VerifyAll();
         }
-
-        private static TreeNodeInfo GetInfo(ClosingStructuresPlugin plugin)
-        {
-            return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>));
-        }
     }
 }
\ No newline at end of file