Index: Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj
===================================================================
diff -u -r5bd2bec348da03a1e6dc666dd19e5333f109eb67 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj	(.../Core.Components.BruTile.IO.csproj)	(revision 5bd2bec348da03a1e6dc666dd19e5333f109eb67)
+++ Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj	(.../Core.Components.BruTile.IO.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -9,6 +9,8 @@
     <AssemblyName>Core.Components.BruTile.IO</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,10 +44,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\lib\net40\System.Data.SQLite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
@@ -66,7 +64,9 @@
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core.Components.BruTile.Data\Core.Components.BruTile.Data.csproj">
@@ -82,13 +82,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: Core/Components/src/Core.Components.BruTile.IO/packages.config
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/src/Core.Components.BruTile.IO/packages.config	(.../packages.config)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.BruTile.IO/packages.config	(.../packages.config)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2017. All rights reserved.
 
 This file is part of Ringtoets.
@@ -23,5 +24,4 @@
 <packages>
   <package id="BruTile" version="0.19.0" targetFramework="net40" />
   <package id="SmartThreadPool.dll" version="2.2.4" targetFramework="net40" />
-  <package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r7adfaba634f7429ffd48a74a946e0542e4e5da22 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 7adfaba634f7429ffd48a74a946e0542e4e5da22)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -9,6 +9,8 @@
     <AssemblyName>Core.Components.DotSpatial</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -63,10 +65,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\lib\net40\System.Data.SQLite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.XML" />
@@ -136,7 +134,9 @@
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -147,13 +147,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: Core/Components/src/Core.Components.DotSpatial/packages.config
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/src/Core.Components.DotSpatial/packages.config	(.../packages.config)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.DotSpatial/packages.config	(.../packages.config)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
 Copyright (C) Stichting Deltares 2017. All rights reserved.
 
 This file is part of Ringtoets.
@@ -22,5 +23,4 @@
 -->
 <packages>
   <package id="BruTile" version="0.19.0" targetFramework="net40" />
-  <package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Core/Components/src/Core.Components.GraphSharp.Forms/Core.Components.GraphSharp.Forms.csproj
===================================================================
diff -u -r515adad18359253ba49f28454f2c2e9bb5cd2e92 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/src/Core.Components.GraphSharp.Forms/Core.Components.GraphSharp.Forms.csproj	(.../Core.Components.GraphSharp.Forms.csproj)	(revision 515adad18359253ba49f28454f2c2e9bb5cd2e92)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/Core.Components.GraphSharp.Forms.csproj	(.../Core.Components.GraphSharp.Forms.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -62,12 +62,10 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
-    <Reference Include="UIAutomationProvider" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
     <Reference Include="WPFExtensions, Version=1.0.3437.34043, Culture=neutral, processorArchitecture=MSIL">
Index: Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj
===================================================================
diff -u -re657b118ab6ba92f2427553cebd79aaf07430ade -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj	(.../Core.Components.OxyPlot.Forms.csproj)	(revision e657b118ab6ba92f2427553cebd79aaf07430ade)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/Core.Components.OxyPlot.Forms.csproj	(.../Core.Components.OxyPlot.Forms.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -45,7 +45,6 @@
       <HintPath>..\..\..\..\packages\OxyPlot.WindowsForms.1.0.0\lib\net40\OxyPlot.WindowsForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
Index: Core/Components/src/Core.Components.Stack.Forms/Core.Components.Stack.Forms.csproj
===================================================================
diff -u -ra2a3022ca8b69a87b4afde3727ebc035f132978f -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/src/Core.Components.Stack.Forms/Core.Components.Stack.Forms.csproj	(.../Core.Components.Stack.Forms.csproj)	(revision a2a3022ca8b69a87b4afde3727ebc035f132978f)
+++ Core/Components/src/Core.Components.Stack.Forms/Core.Components.Stack.Forms.csproj	(.../Core.Components.Stack.Forms.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -53,11 +53,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
-      <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
-      <Name>Core.Common.Controls</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\Core.Components.Stack\Core.Components.Stack.csproj">
       <Project>{6A146889-A3C4-48BF-AF53-C0B0CD355BE4}</Project>
       <Name>Core.Components.Stack</Name>
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -10,6 +10,8 @@
     <AssemblyName>Core.Components.DotSpatial.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,14 +45,6 @@
       <HintPath>..\..\..\..\packages\BruTile.0.19.0\lib\net40\BruTile.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="BruTile.Desktop, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\BruTile.Desktop.0.19.0\lib\net40\BruTile.Desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="BruTile.MbTiles, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\BruTile.Desktop.0.19.0\lib\net40\BruTile.MbTiles.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="DotSpatial.Controls, Version=1.8.0.0, Culture=neutral, PublicKeyToken=4d9e49339a7d240c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\DotSpatial.1.8\DotSpatial.Controls.dll</HintPath>
@@ -86,10 +80,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\lib\net40\System.Data.SQLite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.XML" />
@@ -213,13 +203,6 @@
     <None Include="Resources\BackgroundLayerAfterAddingHalfTransparentTestTiles.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: Core/Components/test/Core.Components.DotSpatial.Test/packages.config
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/test/Core.Components.DotSpatial.Test/packages.config	(.../packages.config)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Core/Components/test/Core.Components.DotSpatial.Test/packages.config	(.../packages.config)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -23,8 +23,6 @@
 -->
 <packages>
   <package id="BruTile" version="0.19.0" targetFramework="net40" />
-  <package id="BruTile.Desktop" version="0.19.0" targetFramework="net40" />
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
-  <package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -83,18 +83,10 @@
       <Project>{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}</Project>
       <Name>Core.Common.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
-      <Project>{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}</Project>
-      <Name>Core.Common.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.Gui.TestUtil\Core.Common.Gui.TestUtil.csproj">
-      <Project>{26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}</Project>
-      <Name>Core.Common.Gui.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
Index: Core/Components/test/Core.Components.GraphSharp.Forms.Test/Core.Components.GraphSharp.Forms.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/test/Core.Components.GraphSharp.Forms.Test/Core.Components.GraphSharp.Forms.Test.csproj	(.../Core.Components.GraphSharp.Forms.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Core/Components/test/Core.Components.GraphSharp.Forms.Test/Core.Components.GraphSharp.Forms.Test.csproj	(.../Core.Components.GraphSharp.Forms.Test.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -74,7 +74,6 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
-    <Reference Include="WindowsFormsIntegration" />
     <Reference Include="WPFExtensions, Version=1.0.3437.34043, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\WPFExtensions.1.0.0\lib\WPFExtensions.dll</HintPath>
       <Private>True</Private>
Index: Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj	(.../Core.Components.GraphSharp.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Core/Components/test/Core.Components.GraphSharp.Test/Core.Components.GraphSharp.Test.csproj	(.../Core.Components.GraphSharp.Test.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -39,14 +39,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GraphSharp, Version=1.0.2.0, Culture=neutral, PublicKeyToken=f9c24778325a6b82, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="GraphSharp.Controls, Version=1.1.0.0, Culture=neutral, PublicKeyToken=f9c24778325a6b82, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.Controls.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -72,10 +64,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="WindowsBase" />
-    <Reference Include="WPFExtensions, Version=1.0.3437.34043, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\WPFExtensions.1.0.0\lib\WPFExtensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\Common\src\Core.Common.Version\GlobalAssembly.cs">
@@ -92,7 +80,9 @@
     <None Include="..\..\..\..\build\Copying.Lesser.licenseheader">
       <Link>Copying.Lesser.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
Index: Core/Components/test/Core.Components.GraphSharp.Test/packages.config
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Components/test/Core.Components.GraphSharp.Test/packages.config	(.../packages.config)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Core/Components/test/Core.Components.GraphSharp.Test/packages.config	(.../packages.config)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -22,8 +22,6 @@
 All rights reserved.
 -->
 <packages>
-  <package id="GraphSharp" version="1.1.0.0" targetFramework="net40" />
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
   <package id="QuickGraph" version="3.6.61119.7" targetFramework="net40" />
-  <package id="WPFExtensions" version="1.0.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj
===================================================================
diff -u -r4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision 4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae)
+++ Core/Plugins/src/Core.Plugins.Chart/Core.Plugins.Chart.csproj	(.../Core.Plugins.Chart.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -49,7 +49,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj
===================================================================
diff -u -r5c6072174d8047b062655d56d523d74c5e740039 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj	(.../Core.Plugins.Map.csproj)	(revision 5c6072174d8047b062655d56d523d74c5e740039)
+++ Core/Plugins/src/Core.Plugins.Map/Core.Plugins.Map.csproj	(.../Core.Plugins.Map.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -43,7 +43,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj
===================================================================
diff -u -r320aceee6e754aa37aa80a80b371a0150cbf2496 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj	(.../Core.Plugins.ProjectExplorer.csproj)	(revision 320aceee6e754aa37aa80a80b371a0150cbf2496)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj	(.../Core.Plugins.ProjectExplorer.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -74,7 +74,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj	(.../Core.Plugins.Chart.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Core.Plugins.Chart.Test.csproj	(.../Core.Plugins.Chart.Test.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -55,7 +55,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Drawing.Design" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj
===================================================================
diff -u -r308e44c50fc1f235b99663e3ab6a8f309a4cc3cb -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj	(.../Demo.Ringtoets.csproj)	(revision 308e44c50fc1f235b99663e3ab6a8f309a4cc3cb)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj	(.../Demo.Ringtoets.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -40,11 +40,9 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -212,16 +210,6 @@
       <Name>Ringtoets.Integration.Plugin</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Ringtoets\MacroStabilityInwards\src\Ringtoets.MacroStabilityInwards.Data\Ringtoets.MacroStabilityInwards.Data.csproj">
-      <Project>{83D6B73E-91D5-46B0-9218-955DA1F75F7C}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.Data</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Ringtoets\MacroStabilityInwards\src\Ringtoets.MacroStabilityInwards.Primitives\Ringtoets.MacroStabilityInwards.Primitives.csproj">
-      <Project>{e9b39743-2dc9-4922-9e0f-6ba3e0e54189}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Ringtoets\Piping\src\Ringtoets.Piping.Data\Ringtoets.Piping.Data.csproj">
       <Project>{ce994cc9-6f6a-48ac-b4be-02c30a21f4db}</Project>
       <Name>Ringtoets.Piping.Data</Name>
Index: Demo/Ringtoets/src/Demo.Ringtoets/Views/StackChartDataView.cs
===================================================================
diff -u -ra2a3022ca8b69a87b4afde3727ebc035f132978f -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Demo/Ringtoets/src/Demo.Ringtoets/Views/StackChartDataView.cs	(.../StackChartDataView.cs)	(revision a2a3022ca8b69a87b4afde3727ebc035f132978f)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Views/StackChartDataView.cs	(.../StackChartDataView.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -50,4 +50,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj	(.../Demo.Ringtoets.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj	(.../Demo.Ringtoets.Test.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -10,6 +10,8 @@
     <AssemblyName>Demo.Ringtoets.Test</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -55,10 +57,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\lib\net40\System.Data.SQLite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
@@ -166,14 +164,6 @@
       <Project>{11f1f874-45af-43e4-8ae5-15a5c9593e28}</Project>
       <Name>Ringtoets.Integration.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Ringtoets\MacroStabilityInwards\src\Ringtoets.MacroStabilityInwards.Data\Ringtoets.MacroStabilityInwards.Data.csproj">
-      <Project>{83D6B73E-91D5-46B0-9218-955DA1F75F7C}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Ringtoets\MacroStabilityInwards\src\Ringtoets.MacroStabilityInwards.Primitives\Ringtoets.MacroStabilityInwards.Primitives.csproj">
-      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Ringtoets\Piping\src\Ringtoets.Piping.Data\Ringtoets.Piping.Data.csproj">
       <Project>{ce994cc9-6f6a-48ac-b4be-02c30a21f4db}</Project>
       <Name>Ringtoets.Piping.Data</Name>
@@ -211,16 +201,11 @@
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\build\net40\System.Data.SQLite.Core.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/packages.config
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/packages.config	(.../packages.config)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/packages.config	(.../packages.config)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -25,5 +25,4 @@
   <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
   <package id="NUnit" version="3.8.1" targetFramework="net40" />
   <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
-  <package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Migration/Core/test/Migration.Core.Storage.Test/Migration.Core.Storage.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Migration/Core/test/Migration.Core.Storage.Test/Migration.Core.Storage.Test.csproj	(.../Migration.Core.Storage.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Migration/Core/test/Migration.Core.Storage.Test/Migration.Core.Storage.Test.csproj	(.../Migration.Core.Storage.Test.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -48,10 +48,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\System.Data.SQLite.Core.1.0.104.0\lib\net40\System.Data.SQLite.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs
===================================================================
diff -u -rcda0b786ef4c81469fb4213e7fc82cb74493fcf9 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision cda0b786ef4c81469fb4213e7fc82cb74493fcf9)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -63,17 +63,17 @@
         /// <summary>
         /// Gets the general closing structures calculation input parameters that apply to each calculation.
         /// </summary>
-        public GeneralClosingStructuresInput GeneralInput { get; private set; }
+        public GeneralClosingStructuresInput GeneralInput { get; }
 
         /// <summary>
         /// Gets the available closing structures for this instance.
         /// </summary>
-        public StructureCollection<ClosingStructure> ClosingStructures { get; private set; }
+        public StructureCollection<ClosingStructure> ClosingStructures { get; }
 
         /// <summary>
         /// Gets the available foreshore profiles for this instance.
         /// </summary>
-        public ForeshoreProfileCollection ForeshoreProfiles { get; private set; }
+        public ForeshoreProfileCollection ForeshoreProfiles { get; }
 
         public CalculationGroup CalculationsGroup { get; }
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs	(.../GeneralClosingStructuresInput.cs)	(revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs	(.../GeneralClosingStructuresInput.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -71,7 +71,7 @@
         /// Gets the gravitational acceleration.
         /// [m/s^2]
         /// </summary>
-        public RoundedDouble GravitationalAcceleration { get; private set; }
+        public RoundedDouble GravitationalAcceleration { get; }
 
         #endregion
 
@@ -122,22 +122,22 @@
         /// <summary>
         /// Gets the model factor overtopping flow.
         /// </summary>
-        public LogNormalDistribution ModelFactorOvertoppingFlow { get; private set; }
+        public LogNormalDistribution ModelFactorOvertoppingFlow { get; }
 
         /// <summary>
         /// Gets the model factor for storage volume.
         /// </summary>
-        public LogNormalDistribution ModelFactorStorageVolume { get; private set; }
+        public LogNormalDistribution ModelFactorStorageVolume { get; }
 
         /// <summary>
         /// Gets the model factor for sub critical flow.
         /// </summary>
-        public VariationCoefficientNormalDistribution ModelFactorSubCriticalFlow { get; private set; }
+        public VariationCoefficientNormalDistribution ModelFactorSubCriticalFlow { get; }
 
         /// <summary>
         /// Gets the model factor for incoming flow volume.
         /// </summary>
-        public RoundedDouble ModelFactorInflowVolume { get; private set; }
+        public RoundedDouble ModelFactorInflowVolume { get; }
 
         #endregion
     }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresScenariosContext.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresScenariosContext.cs	(.../ClosingStructuresScenariosContext.cs)	(revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresScenariosContext.cs	(.../ClosingStructuresScenariosContext.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -52,6 +52,6 @@
         /// <summary>
         /// The parent failure mechanism of the calculation group.
         /// </summary>
-        public ClosingStructuresFailureMechanism ParentFailureMechanism { get; private set; }
+        public ClosingStructuresFailureMechanism ParentFailureMechanism { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs
===================================================================
diff -u -r5ee23018be55ff03a7851e54ca0a6682c521f952 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 5ee23018be55ff03a7851e54ca0a6682c521f952)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -206,7 +206,7 @@
         private void SetMapDataFeatures()
         {
             ReferenceLine referenceLine = data.Parent.ReferenceLine;
-            IEnumerable<FailureMechanismSection> failureMechanismSections = data.WrappedData.Sections;
+            FailureMechanismSection[] failureMechanismSections = data.WrappedData.Sections.ToArray();
             HydraulicBoundaryDatabase hydraulicBoundaryDatabase = data.Parent.HydraulicBoundaryDatabase;
             IEnumerable<ForeshoreProfile> foreshoreProfiles = data.WrappedData.ForeshoreProfiles;
             IEnumerable<ClosingStructure> structures = data.WrappedData.ClosingStructures;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u -r19f983eab8eac43d27e39f6eb9de019bad677652 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 19f983eab8eac43d27e39f6eb9de019bad677652)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -21,7 +21,6 @@
 
 using System.ComponentModel;
 using Ringtoets.ClosingStructures.Data;
-using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.Structures;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj
===================================================================
diff -u -r461842cc9a0a60d00900065b9a7db474db7d7548 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj	(.../Ringtoets.ClosingStructures.Service.csproj)	(revision 461842cc9a0a60d00900065b9a7db474db7d7548)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj	(.../Ringtoets.ClosingStructures.Service.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -32,10 +32,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -59,7 +55,6 @@
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -77,21 +72,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
-      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
-      <Name>Ringtoets.Common.IO</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Utils\Ringtoets.Common.Utils.csproj">
-      <Project>{6A074D65-A81C-4C1C-8E24-F36C916E4ED7}</Project>
-      <Name>Ringtoets.Common.Utils</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>
Fisheye: Tag 1115fb4520d55c5018577d5160f70ee54896cf1a refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -93,10 +93,6 @@
       <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationStochastAssignerTest.cs
===================================================================
diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationStochastAssignerTest.cs	(.../ClosingStructuresCalculationStochastAssignerTest.cs)	(revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationStochastAssignerTest.cs	(.../ClosingStructuresCalculationStochastAssignerTest.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -118,10 +118,12 @@
             // Setup
             var configuration = new ClosingStructuresCalculationConfiguration("name")
             {
-                StructureId = "some structure"
+                StructureId = "some structure",
+                DrainCoefficient = new StochastConfiguration
+                {
+                    Mean = 8.1
+                }
             };
-            configuration.DrainCoefficient = new StochastConfiguration();
-            configuration.DrainCoefficient.Mean = 8.1;
             if (withStandardDeviation)
             {
                 configuration.DrainCoefficient.StandardDeviation = 0.8;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -41,7 +41,6 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
@@ -739,8 +738,13 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var failureMechanism = new TestClosingStructuresFailureMechanism();
             var parent = new CalculationGroup();
-            var calculation = new StructuresCalculation<ClosingStructuresInput>();
-            calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = new TestForeshoreProfile()
+                }
+            };
 
             var nodeData = new ClosingStructuresCalculationContext(calculation,
                                                                    parent,
@@ -779,8 +783,13 @@
 
             var foreshoreProfileInput = new TestForeshoreProfile();
             var parent = new CalculationGroup();
-            var calculation = new StructuresCalculation<ClosingStructuresInput>();
-            calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
+            var calculation = new StructuresCalculation<ClosingStructuresInput>
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = foreshoreProfileInput
+                }
+            };
             TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new ClosingStructuresCalculationContext(calculation,
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -42,7 +42,6 @@
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -39,8 +39,6 @@
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
@@ -492,14 +490,14 @@
                     ToolStripItem calculateAllContextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex];
 
                     Assert.AreEqual("Alles be&rekenen", calculateAllContextMenuItem.Text);
-                    StringAssert.Contains(string.Format("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. {0}", ""), calculateAllContextMenuItem.ToolTipText);
+                    StringAssert.Contains("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. ", calculateAllContextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateAllIcon, calculateAllContextMenuItem.Image);
                     Assert.IsFalse(calculateAllContextMenuItem.Enabled);
 
                     ToolStripItem validateAllContextMenuItem = contextMenu.Items[contextMenuValidateAllIndex];
 
                     Assert.AreEqual("Alles &valideren", validateAllContextMenuItem.Text);
-                    StringAssert.Contains(string.Format("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. {0}", ""), validateAllContextMenuItem.ToolTipText);
+                    StringAssert.Contains("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. ", validateAllContextMenuItem.ToolTipText);
                     TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.ValidateAllIcon, validateAllContextMenuItem.Image);
                     Assert.IsFalse(validateAllContextMenuItem.Enabled);
                 }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs
===================================================================
diff -u -r71d8173532c9c038e25caf03e296beb8e8f9cbe8 -r1115fb4520d55c5018577d5160f70ee54896cf1a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs	(.../ClosingStructureDataSynchronizationServiceTest.cs)	(revision 71d8173532c9c038e25caf03e296beb8e8f9cbe8)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs	(.../ClosingStructureDataSynchronizationServiceTest.cs)	(revision 1115fb4520d55c5018577d5160f70ee54896cf1a)
@@ -30,7 +30,6 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service;