Index: Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs
===================================================================
diff -u -r5b3736b5350315a520f72c90222af261ea651019 -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs	(.../IStorableExtensions.cs)	(revision 5b3736b5350315a520f72c90222af261ea651019)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs	(.../IStorableExtensions.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -22,7 +22,6 @@
 using System;
 using System.Data.Entity;
 using System.Linq;
-using System.Linq.Expressions;
 using Application.Ringtoets.Storage.Exceptions;
 using Application.Ringtoets.Storage.Properties;
 using Core.Common.Base.Storage;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -rb4816e19c7167c26fad825b88dd72b59dcedc13a -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision b4816e19c7167c26fad825b88dd72b59dcedc13a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -211,7 +211,7 @@
             var failureMechanismEntity = entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (int) failureMechanismType);
             if (failureMechanismEntity != null)
             {
-                failureMechanismEntity.ReadAsStandAloneFailureMechanism(standAloneFailureMechanism, collector);
+                failureMechanismEntity.ReadCommonFailureMechanismProperties(standAloneFailureMechanism, collector);
             }
         }
     }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rb4816e19c7167c26fad825b88dd72b59dcedc13a -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision b4816e19c7167c26fad825b88dd72b59dcedc13a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -60,7 +60,7 @@
                 throw new ArgumentNullException("collector");
             }
 
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
 
             if (entity.PipingFailureMechanismMetaEntities.Count > 0)
             {
@@ -102,7 +102,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsGrassCoverErosionInwardsFailureMechanism(this FailureMechanismEntity entity, GrassCoverErosionInwardsFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadGrassCoverErosionInwardsMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -125,7 +125,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsHeightStructuresFailureMechanism(this FailureMechanismEntity entity, HeightStructuresFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadHeightStructuresMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -148,7 +148,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism(this FailureMechanismEntity entity, StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadStrengthStabilityLengthwiseConstructionMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -171,7 +171,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsTechnicalInnovationFailureMechanism(this FailureMechanismEntity entity, TechnicalInnovationFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadTechnicalInnovationMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -194,7 +194,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsWaterPressureAsphaltCoverFailureMechanism(this FailureMechanismEntity entity, WaterPressureAsphaltCoverFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadWaterPressureAsphaltCoverMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -217,7 +217,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsClosingStructureFailureMechanism(this FailureMechanismEntity entity, ClosingStructureFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadClosingStructureMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -240,7 +240,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsMacrostabilityInwardsFailureMechanism(this FailureMechanismEntity entity, MacrostabilityInwardsFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadMacrostabilityInwardsMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -263,7 +263,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsMacrostabilityOutwardsFailureMechanism(this FailureMechanismEntity entity, MacrostabilityOutwardsFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadMacrostabilityOutwardsMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -286,7 +286,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         internal static void ReadAsWaveImpactAsphaltCoverFailureMechanism(this FailureMechanismEntity entity, WaveImpactAsphaltCoverFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
             entity.ReadWaveImpactAsphaltCoverMechanismSectionResults(failureMechanism, collector);
         }
 
@@ -307,7 +307,7 @@
         /// <param name="entity">The <see cref="FailureMechanismEntity"/> to read into a <see cref="IFailureMechanism"/>.</param>
         /// <param name="failureMechanism">The target of the read operation.</param>
         /// <param name="collector">The object keeping track of read operations.</param>
-        internal static void ReadAsStandAloneFailureMechanism(this FailureMechanismEntity entity, IFailureMechanism failureMechanism, ReadConversionCollector collector)
+        internal static void ReadCommonFailureMechanismProperties(this FailureMechanismEntity entity, IFailureMechanism failureMechanism, ReadConversionCollector collector)
         {
             failureMechanism.StorageId = entity.FailureMechanismEntityId;
             failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs
===================================================================
diff -u -r5b3736b5350315a520f72c90222af261ea651019 -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs	(.../AssessmentSectionUpdateExtensions.cs)	(revision 5b3736b5350315a520f72c90222af261ea651019)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs	(.../AssessmentSectionUpdateExtensions.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -25,7 +25,6 @@
 using Application.Ringtoets.Storage.Create;
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Exceptions;
-using Application.Ringtoets.Storage.Properties;
 using Core.Common.Base.Geometry;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Integration.Data;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -re0ef393f7069a18d7e160aceaf91f603dfc8c5ae -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IFailureMechanismCreateExtensionsTest.cs	(.../IFailureMechanismCreateExtensionsTest.cs)	(revision e0ef393f7069a18d7e160aceaf91f603dfc8c5ae)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IFailureMechanismCreateExtensionsTest.cs	(.../IFailureMechanismCreateExtensionsTest.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -23,9 +23,7 @@
 using Application.Ringtoets.Storage.Create;
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.TestUtil;
-using Core.Common.Base.Geometry;
 using NUnit.Framework;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 
 namespace Application.Ringtoets.Storage.Test.Create
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IStorableExtensionsTest.cs
===================================================================
diff -u -r5b3736b5350315a520f72c90222af261ea651019 -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IStorableExtensionsTest.cs	(.../IStorableExtensionsTest.cs)	(revision 5b3736b5350315a520f72c90222af261ea651019)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IStorableExtensionsTest.cs	(.../IStorableExtensionsTest.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -132,7 +132,7 @@
 
             // Assert
             var message = Assert.Throws<EntityNotFoundException>(test).Message;
-            Assert.AreEqual(string.Format("Het object 'WithId' met id '0' is niet gevonden."), message);
+            Assert.AreEqual("Het object \'WithId\' met id \'0\' is niet gevonden.", message);
         }
 
         [Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -rc5499aa0c2af6b5b54c329cbed1a39706bf49cd3 -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision c5499aa0c2af6b5b54c329cbed1a39706bf49cd3)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -337,7 +337,7 @@
             var failureMechanism = new TestFailureMechanism();
 
             // Call
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
 
             // Assert
             Assert.IsEmpty(failureMechanism.Sections);
@@ -371,7 +371,7 @@
             var failureMechanism = new TestFailureMechanism();
 
             // Call
-            entity.ReadAsStandAloneFailureMechanism(failureMechanism, collector);
+            entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
 
             // Assert
             Assert.AreEqual(1, failureMechanism.Sections.Count());
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicDatabaseHelper.cs
===================================================================
diff -u -r52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicDatabaseHelper.cs	(.../HydraulicDatabaseHelper.cs)	(revision 52bb7ac3ae5191063f4b26ea26cb4b2ce5f486ed)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicDatabaseHelper.cs	(.../HydraulicDatabaseHelper.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -58,8 +58,8 @@
         /// </summary>
         /// <param name="database">The database to compare the version of.</param>
         /// <param name="pathToDatabase">The path to the database to compare the version of.</param>
-        /// <returns><c>true</c> if <paramref name="database"/> is of the given <paramref name="version"/>,
-        /// <c>false</c> otherwise.</returns>
+        /// <returns><c>true</c> if <paramref name="database"/> equals the version of the database at
+        /// <paramref name="pathToDatabase"/>, <c>false</c> otherwise.</returns>
         /// <exception cref="CriticalFileReadException">Thrown when no connection with the hydraulic 
         /// boundary database could be created using <paramref name="pathToDatabase"/>.</exception>
         /// <exception cref="ArgumentNullException">Thrown when:
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityTest.cs
===================================================================
diff -u -r6ccc539ce58e63f0e0fbff0da189c87b65146129 -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityTest.cs	(.../HydraRingActivityTest.cs)	(revision 6ccc539ce58e63f0e0fbff0da189c87b65146129)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Activities/HydraRingActivityTest.cs	(.../HydraRingActivityTest.cs)	(revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4)
@@ -119,7 +119,6 @@
             Observable observableObject = new TestObservable();
             observableObject.Attach(observerMock);
 
-            double newValue = 2.0;
             TestHydraRingActivity activity = new TestHydraRingActivity(true, () => null, observableObject);
 
             activity.Run();