diff --git a/VectoCore/VectoCore/InputData/Reader/IVectoRunDataFactoryFactory.cs b/VectoCore/VectoCore/InputData/Reader/IVectoRunDataFactoryFactory.cs
index b928e4a345969269f4d7f51de04f8e17ff017d04..80b27c015fade735b2b7b9de3f1dceb4bcc2986b 100644
--- a/VectoCore/VectoCore/InputData/Reader/IVectoRunDataFactoryFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/IVectoRunDataFactoryFactory.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCore.OutputData;
 
 namespace TUGraz.VectoCore.InputData
@@ -19,7 +13,7 @@ namespace TUGraz.VectoCore.InputData
 		/// <param name="inputDataProvider"></param>
 		/// <param name="report"></param>
 		/// <returns></returns>
-		IVectoRunDataFactory CreateDeclarationRunDataFactory([NotNull] IInputDataProvider inputDataProvider,
+		IVectoRunDataFactory CreateDeclarationRunDataFactory(IInputDataProvider inputDataProvider,
 			IDeclarationReport report, IVTPReport vtpReport);
 	}
 }
diff --git a/VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs b/VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs
index 6546713afeeb2ddf50b1181fc0e683bfdb28b7bc..a6c47b6b84b75c9f92564085bf40ef196e24571f 100644
--- a/VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs
@@ -1,16 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCore.InputData.Reader.Impl;
 using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.OutputData;
-using TUGraz.VectoCore.OutputData.XML;
 
 namespace TUGraz.VectoCore.InputData.Reader
 {
@@ -22,7 +16,7 @@ namespace TUGraz.VectoCore.InputData.Reader
 		/// <param name="inputDataProvider"></param>
 		/// <param name="report"></param>
 		/// <returns></returns>
-		public IVectoRunDataFactory CreateDeclarationRunDataFactory([NotNull] IInputDataProvider inputDataProvider,
+		public IVectoRunDataFactory CreateDeclarationRunDataFactory(IInputDataProvider inputDataProvider,
 			IDeclarationReport report, IVTPReport vtpReport)
 		{
 			if (inputDataProvider == null)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/IFollowUpSimulatorFactoryCreator.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/IFollowUpSimulatorFactoryCreator.cs
index 241f1cb7b23ff0e7a5878291406ce7bc8b6858ba..df9125aa06538519d6197b3c7b5b041cc12cce25 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/IFollowUpSimulatorFactoryCreator.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/IFollowUpSimulatorFactoryCreator.cs
@@ -1,12 +1,5 @@
-using System;
-using System.CodeDom;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using System.Xml;
-using JetBrains.Annotations;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
@@ -125,7 +118,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
 
 		public CompletedAfterInterimPrimaryFactoryCreator(IMultistageVIFInputData originalInputData,
 			IOutputDataWriter originalOutputDataWriter,
-			[NotNull] IDeclarationReport originalDeclarationReport,
+			IDeclarationReport originalDeclarationReport,
 			IXMLInputDataReader inputDataReader,
 			ISimulatorFactoryFactory simulatorFactoryFactory, 
 			bool validate) : base(simulatorFactoryFactory, validate)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryDeclaration.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryDeclaration.cs
index f45f9dbc22ca7ed5ebb8d2d57be245f6e2758afc..c376f56987254e3ebc4f08069285e9ae1ba30378 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryDeclaration.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryDeclaration.cs
@@ -1,5 +1,4 @@
 using System;
-using JetBrains.Annotations;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
@@ -84,7 +83,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
 									_currentStageInputData;
 		}
 
-		[UsedImplicitly]
 		public SimulatorFactoryDeclaration(
 			IInputDataProvider dataProvider,
 			IOutputDataWriter writer,
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryEngineering.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryEngineering.cs
index c8da6c30de9165b6cd6529f03ab92a79983b69e5..61aaef20da4ffca41c726ea4f3b684b98b0b8a01 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryEngineering.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactoryEngineering.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using TUGraz.VectoCommon.Exceptions;
+using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCore.InputData.Reader.Impl;
@@ -14,7 +8,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory
 {
     public class SimulatorFactoryEngineering : SimulatorFactory
     {
-		[UsedImplicitly]
         public SimulatorFactoryEngineering(IInputDataProvider dataProvider, IOutputDataWriter writer, bool validate) : base(ExecutionMode.Engineering, writer, validate)
         {
             CreateEngineeringDataReader(dataProvider);
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 05b2c77aed5ea690fb5b5274d28395cb65a6fadf..1cd43f48c10b6db34528b5275caa09d886c98c99 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -8,9 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" />
     <PackageReference Include="NLog" Version="4.7.13" />