diff --git a/app/Api/V1/Controllers/ImportController.php b/app/Api/V1/Controllers/ImportController.php
index 1c55fd6e4a..1e2e84e7b6 100644
--- a/app/Api/V1/Controllers/ImportController.php
+++ b/app/Api/V1/Controllers/ImportController.php
@@ -40,6 +40,8 @@ use League\Fractal\Resource\Item;
 
 /**
  * Class ImportController
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ImportController extends Controller
 {
diff --git a/app/Console/Commands/Import/CreateCSVImport.php b/app/Console/Commands/Import/CreateCSVImport.php
index d402271c27..5af1f03c41 100644
--- a/app/Console/Commands/Import/CreateCSVImport.php
+++ b/app/Console/Commands/Import/CreateCSVImport.php
@@ -39,6 +39,8 @@ use Log;
 
 /**
  * Class CreateCSVImport.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class CreateCSVImport extends Command
 {
diff --git a/app/Http/Controllers/Import/CallbackController.php b/app/Http/Controllers/Import/CallbackController.php
index 1c202f7320..fe069701b7 100644
--- a/app/Http/Controllers/Import/CallbackController.php
+++ b/app/Http/Controllers/Import/CallbackController.php
@@ -31,6 +31,8 @@ use Log;
 
 /**
  * Class CallbackController
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class CallbackController extends Controller
 {
diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php
index 67d3f54d63..1bcb51c57c 100644
--- a/app/Http/Controllers/Import/IndexController.php
+++ b/app/Http/Controllers/Import/IndexController.php
@@ -34,6 +34,8 @@ use Log;
 /**
  *
  * Class IndexController
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class IndexController extends Controller
 {
diff --git a/app/Http/Controllers/Import/JobConfigurationController.php b/app/Http/Controllers/Import/JobConfigurationController.php
index 931f3dce9b..c0df56fe1f 100644
--- a/app/Http/Controllers/Import/JobConfigurationController.php
+++ b/app/Http/Controllers/Import/JobConfigurationController.php
@@ -34,6 +34,8 @@ use Log;
 
 /**
  * Class JobConfigurationController
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class JobConfigurationController extends Controller
 {
diff --git a/app/Http/Controllers/Import/JobStatusController.php b/app/Http/Controllers/Import/JobStatusController.php
index c311c0ceac..c4a392a996 100644
--- a/app/Http/Controllers/Import/JobStatusController.php
+++ b/app/Http/Controllers/Import/JobStatusController.php
@@ -34,6 +34,8 @@ use Log;
 
 /**
  * Class JobStatusController
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class JobStatusController extends Controller
 {
diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php
index 062f49d67a..f148d39149 100644
--- a/app/Http/Controllers/Import/PrerequisitesController.php
+++ b/app/Http/Controllers/Import/PrerequisitesController.php
@@ -32,6 +32,8 @@ use Log;
 
 /**
  * Class PrerequisitesController
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class PrerequisitesController extends Controller
 {
diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php
index 09813c752a..91b3f09367 100644
--- a/app/Http/Middleware/StartFireflySession.php
+++ b/app/Http/Middleware/StartFireflySession.php
@@ -45,18 +45,19 @@ class StartFireflySession extends StartSession
         $isScriptPage = strpos($uri, 'jscript');
         $isDeletePage = strpos($uri, 'delete');
         $isLoginPage  = strpos($uri, '/login');
+        $isJsonPage  = strpos($uri, '/json');
 
         // also stop remembering "delete" URL's.
 
         if (false === $isScriptPage && false === $isDeletePage
-            && false === $isLoginPage
+            && false === $isLoginPage && false === $isJsonPage
             && 'GET' === $request->method()
             && !$request->ajax()) {
             $session->setPreviousUrl($uri);
-            //Log::debug(sprintf('Will set previous URL to %s', $uri));
+            Log::debug(sprintf('Will set previous URL to %s', $uri));
 
             return;
         }
-        //Log::debug(sprintf('Will NOT set previous URL to %s', $uri));
+        Log::debug(sprintf('Will NOT set previous URL to %s', $uri));
     }
 }
diff --git a/app/Import/Converter/Amount.php b/app/Import/Converter/Amount.php
index 00c7fdbfe4..4ee70cce4f 100644
--- a/app/Import/Converter/Amount.php
+++ b/app/Import/Converter/Amount.php
@@ -26,6 +26,8 @@ use Log;
 
 /**
  * Class Amount.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class Amount implements ConverterInterface
 {
diff --git a/app/Import/Converter/AmountCredit.php b/app/Import/Converter/AmountCredit.php
index b24747b6dd..5d0f4d5c44 100644
--- a/app/Import/Converter/AmountCredit.php
+++ b/app/Import/Converter/AmountCredit.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Converter;
 
 /**
  * Class AmountCredit
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class AmountCredit implements ConverterInterface
 {
diff --git a/app/Import/Converter/AmountDebit.php b/app/Import/Converter/AmountDebit.php
index 6748802df9..403240a128 100644
--- a/app/Import/Converter/AmountDebit.php
+++ b/app/Import/Converter/AmountDebit.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Converter;
 
 /**
  * Class AmountDebit
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class AmountDebit implements ConverterInterface
 {
diff --git a/app/Import/Converter/AmountNegated.php b/app/Import/Converter/AmountNegated.php
index bd51b71fa7..690eaed6be 100644
--- a/app/Import/Converter/AmountNegated.php
+++ b/app/Import/Converter/AmountNegated.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Converter;
 
 /**
  * Class AmountNegated
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class AmountNegated implements ConverterInterface
 {
diff --git a/app/Import/Converter/BankDebitCredit.php b/app/Import/Converter/BankDebitCredit.php
index 600392ba2c..e7c19265c2 100644
--- a/app/Import/Converter/BankDebitCredit.php
+++ b/app/Import/Converter/BankDebitCredit.php
@@ -29,6 +29,8 @@ use Log;
 /**
  *
  * Class BankDebitCredit
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class BankDebitCredit implements ConverterInterface
 {
diff --git a/app/Import/Converter/ConverterInterface.php b/app/Import/Converter/ConverterInterface.php
index 3009f56292..74343e2b50 100644
--- a/app/Import/Converter/ConverterInterface.php
+++ b/app/Import/Converter/ConverterInterface.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Converter;
 
 /**
  * Interface ConverterInterface.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface ConverterInterface
 {
diff --git a/app/Import/JobConfiguration/BunqJobConfiguration.php b/app/Import/JobConfiguration/BunqJobConfiguration.php
index 195594849b..74ba84c109 100644
--- a/app/Import/JobConfiguration/BunqJobConfiguration.php
+++ b/app/Import/JobConfiguration/BunqJobConfiguration.php
@@ -34,6 +34,8 @@ use Log;
 
 /**
  * Class BunqJobConfiguration
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class BunqJobConfiguration implements JobConfigurationInterface
 {
diff --git a/app/Import/JobConfiguration/FakeJobConfiguration.php b/app/Import/JobConfiguration/FakeJobConfiguration.php
index b1a6ca01f0..c4a3f8d0c9 100644
--- a/app/Import/JobConfiguration/FakeJobConfiguration.php
+++ b/app/Import/JobConfiguration/FakeJobConfiguration.php
@@ -29,6 +29,8 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Class FakeJobConfiguration
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class FakeJobConfiguration implements JobConfigurationInterface
 {
diff --git a/app/Import/JobConfiguration/FileJobConfiguration.php b/app/Import/JobConfiguration/FileJobConfiguration.php
index df829b1055..695c74a979 100644
--- a/app/Import/JobConfiguration/FileJobConfiguration.php
+++ b/app/Import/JobConfiguration/FileJobConfiguration.php
@@ -37,6 +37,8 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Class FileJobConfiguration
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class FileJobConfiguration implements JobConfigurationInterface
 {
diff --git a/app/Import/JobConfiguration/FinTSConfigurationSteps.php b/app/Import/JobConfiguration/FinTSConfigurationSteps.php
index 5144a4fe00..0f198ec11a 100644
--- a/app/Import/JobConfiguration/FinTSConfigurationSteps.php
+++ b/app/Import/JobConfiguration/FinTSConfigurationSteps.php
@@ -26,6 +26,8 @@ namespace FireflyIII\Import\JobConfiguration;
 /**
  *
  * Class FinTSConfigurationSteps
+ * @deprecated
+ * @codeCoverageIgnore
  */
 abstract class FinTSConfigurationSteps
 {
diff --git a/app/Import/JobConfiguration/FinTSJobConfiguration.php b/app/Import/JobConfiguration/FinTSJobConfiguration.php
index 61f100b0f1..d175dc9995 100644
--- a/app/Import/JobConfiguration/FinTSJobConfiguration.php
+++ b/app/Import/JobConfiguration/FinTSJobConfiguration.php
@@ -32,6 +32,8 @@ use Illuminate\Support\MessageBag;
 /**
  *
  * Class FinTSJobConfiguration
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class FinTSJobConfiguration implements JobConfigurationInterface
 {
diff --git a/app/Import/JobConfiguration/JobConfigurationInterface.php b/app/Import/JobConfiguration/JobConfigurationInterface.php
index b4223e0b45..ad81d279c2 100644
--- a/app/Import/JobConfiguration/JobConfigurationInterface.php
+++ b/app/Import/JobConfiguration/JobConfigurationInterface.php
@@ -27,6 +27,8 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Interface JobConfigurationInterface.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface JobConfigurationInterface
 {
diff --git a/app/Import/JobConfiguration/SpectreJobConfiguration.php b/app/Import/JobConfiguration/SpectreJobConfiguration.php
index 92b1688634..22f7c3b29b 100644
--- a/app/Import/JobConfiguration/SpectreJobConfiguration.php
+++ b/app/Import/JobConfiguration/SpectreJobConfiguration.php
@@ -37,6 +37,8 @@ use Log;
 
 /**
  * Class SpectreJobConfiguration
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class SpectreJobConfiguration implements JobConfigurationInterface
 {
diff --git a/app/Import/JobConfiguration/YnabJobConfiguration.php b/app/Import/JobConfiguration/YnabJobConfiguration.php
index 4c886748a5..90e52acbb4 100644
--- a/app/Import/JobConfiguration/YnabJobConfiguration.php
+++ b/app/Import/JobConfiguration/YnabJobConfiguration.php
@@ -35,6 +35,8 @@ use Log;
 
 /**
  * Class YnabJobConfiguration
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class YnabJobConfiguration implements JobConfigurationInterface
 {
diff --git a/app/Import/Mapper/AssetAccountIbans.php b/app/Import/Mapper/AssetAccountIbans.php
index 2463b7ee1a..0c12576b95 100644
--- a/app/Import/Mapper/AssetAccountIbans.php
+++ b/app/Import/Mapper/AssetAccountIbans.php
@@ -28,6 +28,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class AssetAccounts.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class AssetAccountIbans implements MapperInterface
 {
diff --git a/app/Import/Mapper/AssetAccounts.php b/app/Import/Mapper/AssetAccounts.php
index 69b6eac96c..7fef7fbda9 100644
--- a/app/Import/Mapper/AssetAccounts.php
+++ b/app/Import/Mapper/AssetAccounts.php
@@ -28,6 +28,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class AssetAccounts.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class AssetAccounts implements MapperInterface
 {
diff --git a/app/Import/Mapper/Bills.php b/app/Import/Mapper/Bills.php
index d24e54a83d..3c41fa5006 100644
--- a/app/Import/Mapper/Bills.php
+++ b/app/Import/Mapper/Bills.php
@@ -27,6 +27,8 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 
 /**
  * Class Bills.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class Bills implements MapperInterface
 {
diff --git a/app/Import/Mapper/Budgets.php b/app/Import/Mapper/Budgets.php
index 917d599463..415a46b924 100644
--- a/app/Import/Mapper/Budgets.php
+++ b/app/Import/Mapper/Budgets.php
@@ -27,6 +27,8 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 
 /**
  * Class Budgets.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class Budgets implements MapperInterface
 {
diff --git a/app/Import/Mapper/Categories.php b/app/Import/Mapper/Categories.php
index b4a361b01f..eab0caf39e 100644
--- a/app/Import/Mapper/Categories.php
+++ b/app/Import/Mapper/Categories.php
@@ -27,6 +27,8 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 
 /**
  * Class Categories.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class Categories implements MapperInterface
 {
diff --git a/app/Import/Mapper/MapperInterface.php b/app/Import/Mapper/MapperInterface.php
index cbc289ba35..047aa6c1b3 100644
--- a/app/Import/Mapper/MapperInterface.php
+++ b/app/Import/Mapper/MapperInterface.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Mapper;
 
 /**
  * Interface MapperInterface.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface MapperInterface
 {
diff --git a/app/Import/Mapper/OpposingAccountIbans.php b/app/Import/Mapper/OpposingAccountIbans.php
index 4e63d268a5..8512721067 100644
--- a/app/Import/Mapper/OpposingAccountIbans.php
+++ b/app/Import/Mapper/OpposingAccountIbans.php
@@ -28,6 +28,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class OpposingAccounts.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class OpposingAccountIbans implements MapperInterface
 {
diff --git a/app/Import/Mapper/OpposingAccounts.php b/app/Import/Mapper/OpposingAccounts.php
index efdcd00b7d..51db102b4d 100644
--- a/app/Import/Mapper/OpposingAccounts.php
+++ b/app/Import/Mapper/OpposingAccounts.php
@@ -28,6 +28,9 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class OpposingAccounts.
+ * @deprecated
+ * @codeCoverageIgnore
+ *
  */
 class OpposingAccounts implements MapperInterface
 {
diff --git a/app/Import/Mapper/Tags.php b/app/Import/Mapper/Tags.php
index b97e03a63c..d7355b9e09 100644
--- a/app/Import/Mapper/Tags.php
+++ b/app/Import/Mapper/Tags.php
@@ -27,6 +27,8 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 
 /**
  * Class Tags.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class Tags implements MapperInterface
 {
diff --git a/app/Import/Mapper/TransactionCurrencies.php b/app/Import/Mapper/TransactionCurrencies.php
index e36c6d00f4..49871996a4 100644
--- a/app/Import/Mapper/TransactionCurrencies.php
+++ b/app/Import/Mapper/TransactionCurrencies.php
@@ -26,6 +26,8 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 
 /**
  * Class TransactionCurrencies.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class TransactionCurrencies implements MapperInterface
 {
diff --git a/app/Import/MapperPreProcess/PreProcessorInterface.php b/app/Import/MapperPreProcess/PreProcessorInterface.php
index 1368d5d600..c51583fd18 100644
--- a/app/Import/MapperPreProcess/PreProcessorInterface.php
+++ b/app/Import/MapperPreProcess/PreProcessorInterface.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\MapperPreProcess;
 
 /**
  * Interface PreProcessorInterface.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface PreProcessorInterface
 {
diff --git a/app/Import/MapperPreProcess/TagsComma.php b/app/Import/MapperPreProcess/TagsComma.php
index 7c2489663c..a15ab82917 100644
--- a/app/Import/MapperPreProcess/TagsComma.php
+++ b/app/Import/MapperPreProcess/TagsComma.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\MapperPreProcess;
 
 /**
  * Class TagsComma.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class TagsComma implements PreProcessorInterface
 {
diff --git a/app/Import/MapperPreProcess/TagsSpace.php b/app/Import/MapperPreProcess/TagsSpace.php
index 4675c90f86..3d5402277c 100644
--- a/app/Import/MapperPreProcess/TagsSpace.php
+++ b/app/Import/MapperPreProcess/TagsSpace.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\MapperPreProcess;
 
 /**
  * Class TagsSpace.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class TagsSpace implements PreProcessorInterface
 {
diff --git a/app/Import/Prerequisites/BunqPrerequisites.php b/app/Import/Prerequisites/BunqPrerequisites.php
index 4feea138ff..5dff898c62 100644
--- a/app/Import/Prerequisites/BunqPrerequisites.php
+++ b/app/Import/Prerequisites/BunqPrerequisites.php
@@ -33,6 +33,8 @@ use Log;
 
 /**
  * This class contains all the routines necessary to connect to Bunq.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class BunqPrerequisites implements PrerequisitesInterface
 {
diff --git a/app/Import/Prerequisites/FakePrerequisites.php b/app/Import/Prerequisites/FakePrerequisites.php
index ba9dca7518..f17650b499 100644
--- a/app/Import/Prerequisites/FakePrerequisites.php
+++ b/app/Import/Prerequisites/FakePrerequisites.php
@@ -30,6 +30,8 @@ use Log;
  * This class contains all the routines necessary for the fake import provider.
  *
  * Class FakePrerequisites
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class FakePrerequisites implements PrerequisitesInterface
 {
diff --git a/app/Import/Prerequisites/FilePrerequisites.php b/app/Import/Prerequisites/FilePrerequisites.php
index 469d82611d..6aaec20b42 100644
--- a/app/Import/Prerequisites/FilePrerequisites.php
+++ b/app/Import/Prerequisites/FilePrerequisites.php
@@ -30,6 +30,7 @@ use Log;
  *
  * This class contains all the routines necessary to import from a file. Hint: there are none.
  *
+ * @deprecated
  * @codeCoverageIgnore
  */
 class FilePrerequisites implements PrerequisitesInterface
diff --git a/app/Import/Prerequisites/PrerequisitesInterface.php b/app/Import/Prerequisites/PrerequisitesInterface.php
index d6dc89edb6..0feeaa42d0 100644
--- a/app/Import/Prerequisites/PrerequisitesInterface.php
+++ b/app/Import/Prerequisites/PrerequisitesInterface.php
@@ -27,6 +27,8 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Interface PrerequisitesInterface
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface PrerequisitesInterface
 {
diff --git a/app/Import/Prerequisites/SpectrePrerequisites.php b/app/Import/Prerequisites/SpectrePrerequisites.php
index 9f77c7db4a..d24dc4eada 100644
--- a/app/Import/Prerequisites/SpectrePrerequisites.php
+++ b/app/Import/Prerequisites/SpectrePrerequisites.php
@@ -29,6 +29,8 @@ use Log;
 
 /**
  * This class contains all the routines necessary to connect to Spectre.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class SpectrePrerequisites implements PrerequisitesInterface
 {
diff --git a/app/Import/Prerequisites/YnabPrerequisites.php b/app/Import/Prerequisites/YnabPrerequisites.php
index 87d22b72cb..0e18b3f864 100644
--- a/app/Import/Prerequisites/YnabPrerequisites.php
+++ b/app/Import/Prerequisites/YnabPrerequisites.php
@@ -29,6 +29,8 @@ use Log;
 
 /**
  * Class YnabPrerequisites
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class YnabPrerequisites implements PrerequisitesInterface
 {
diff --git a/app/Import/Routine/BunqRoutine.php b/app/Import/Routine/BunqRoutine.php
index 9c1c1462ee..9e1ef123c8 100644
--- a/app/Import/Routine/BunqRoutine.php
+++ b/app/Import/Routine/BunqRoutine.php
@@ -32,6 +32,8 @@ use Log;
 
 /**
  * Class BunqRoutine
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class BunqRoutine implements RoutineInterface
 {
diff --git a/app/Import/Routine/FakeRoutine.php b/app/Import/Routine/FakeRoutine.php
index babb494695..6774a03116 100644
--- a/app/Import/Routine/FakeRoutine.php
+++ b/app/Import/Routine/FakeRoutine.php
@@ -33,6 +33,8 @@ use Log;
 
 /**
  * Class FakeRoutine
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class FakeRoutine implements RoutineInterface
 {
diff --git a/app/Import/Routine/FileRoutine.php b/app/Import/Routine/FileRoutine.php
index 589530bec2..f058360e23 100644
--- a/app/Import/Routine/FileRoutine.php
+++ b/app/Import/Routine/FileRoutine.php
@@ -30,6 +30,8 @@ use Log;
 
 /**
  * Class FileRoutine
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class FileRoutine implements RoutineInterface
 {
diff --git a/app/Import/Routine/FinTSRoutine.php b/app/Import/Routine/FinTSRoutine.php
index f43156b6e1..0b21d95e13 100644
--- a/app/Import/Routine/FinTSRoutine.php
+++ b/app/Import/Routine/FinTSRoutine.php
@@ -33,6 +33,8 @@ use Illuminate\Support\Facades\Log;
 /**
  *
  * Class FinTSRoutine
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class FinTSRoutine implements RoutineInterface
 {
diff --git a/app/Import/Routine/RoutineInterface.php b/app/Import/Routine/RoutineInterface.php
index edd2455ac3..61a26e19bf 100644
--- a/app/Import/Routine/RoutineInterface.php
+++ b/app/Import/Routine/RoutineInterface.php
@@ -27,6 +27,8 @@ use FireflyIII\Models\ImportJob;
 
 /**
  * Interface RoutineInterface
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface RoutineInterface
 {
diff --git a/app/Import/Routine/SpectreRoutine.php b/app/Import/Routine/SpectreRoutine.php
index 2fd536a92b..81c67c6e94 100644
--- a/app/Import/Routine/SpectreRoutine.php
+++ b/app/Import/Routine/SpectreRoutine.php
@@ -32,6 +32,8 @@ use Log;
 
 /**
  * Class SpectreRoutine
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class SpectreRoutine implements RoutineInterface
 {
diff --git a/app/Import/Routine/YnabRoutine.php b/app/Import/Routine/YnabRoutine.php
index 9e687ed9a0..3807f46b03 100644
--- a/app/Import/Routine/YnabRoutine.php
+++ b/app/Import/Routine/YnabRoutine.php
@@ -34,6 +34,8 @@ use Log;
 
 /**
  * Class YnabRoutine
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class YnabRoutine implements RoutineInterface
 {
diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php
index 88b9b8bdf3..6f5a946dd3 100644
--- a/app/Import/Specifics/AbnAmroDescription.php
+++ b/app/Import/Specifics/AbnAmroDescription.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Specifics;
 
 /**
  * Class AbnAmroDescription.
+ * @deprecated
+ * @codeCoverageIgnore
  *
  * Parses the description from txt files for ABN AMRO bank accounts.
  *
diff --git a/app/Import/Specifics/Belfius.php b/app/Import/Specifics/Belfius.php
index 626bf34a7f..ba6e9f9df8 100644
--- a/app/Import/Specifics/Belfius.php
+++ b/app/Import/Specifics/Belfius.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Specifics;
 
 /**
  * Class Belfius.
+ * @deprecated
+ * @codeCoverageIgnore
  *
  * Fixes Belfius CSV files to:
  *  - Correct descriptions for recurring transactions so doubles can be detected when the equivalent incoming
diff --git a/app/Import/Specifics/IngBelgium.php b/app/Import/Specifics/IngBelgium.php
index eb7ffdaf14..4161f4e6ac 100644
--- a/app/Import/Specifics/IngBelgium.php
+++ b/app/Import/Specifics/IngBelgium.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Specifics;
 
 /**
  * Class IngBelgium.
+ * @deprecated
+ * @codeCoverageIgnore
  *
  * Parses the description and opposing account information (IBAN and name) from CSV files for ING Belgium bank accounts.
  *
diff --git a/app/Import/Specifics/IngDescription.php b/app/Import/Specifics/IngDescription.php
index 35b3f63df1..510a08ce39 100644
--- a/app/Import/Specifics/IngDescription.php
+++ b/app/Import/Specifics/IngDescription.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Specifics;
 
 /**
  * Class IngDescription.
+ * @deprecated
+ * @codeCoverageIgnore
  *
  * Parses the description from CSV files for Ing bank accounts.
  *
diff --git a/app/Import/Specifics/PresidentsChoice.php b/app/Import/Specifics/PresidentsChoice.php
index 737bec0f15..e7ecf495ef 100644
--- a/app/Import/Specifics/PresidentsChoice.php
+++ b/app/Import/Specifics/PresidentsChoice.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Specifics;
 
 /**
  * Class PresidentsChoice.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class PresidentsChoice implements SpecificInterface
 {
diff --git a/app/Import/Specifics/SnsDescription.php b/app/Import/Specifics/SnsDescription.php
index 7eeb9bbcf6..f67cc45e82 100644
--- a/app/Import/Specifics/SnsDescription.php
+++ b/app/Import/Specifics/SnsDescription.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Specifics;
 
 /**
  * Class SnsDescription.
+ * @codeCoverageIgnore
+ * @deprecated
  */
 class SnsDescription implements SpecificInterface
 {
diff --git a/app/Import/Specifics/SpecificInterface.php b/app/Import/Specifics/SpecificInterface.php
index 9eaceb695b..1c235e58e5 100644
--- a/app/Import/Specifics/SpecificInterface.php
+++ b/app/Import/Specifics/SpecificInterface.php
@@ -24,6 +24,8 @@ namespace FireflyIII\Import\Specifics;
 
 /**
  * Interface SpecificInterface.
+ * @codeCoverageIgnore
+ * @deprecated
  */
 interface SpecificInterface
 {
diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php
index 2ee636c9db..886d9a9b11 100644
--- a/app/Import/Storage/ImportArrayStorage.php
+++ b/app/Import/Storage/ImportArrayStorage.php
@@ -51,6 +51,8 @@ use Log;
  * Creates new transactions based on arrays.
  *
  * Class ImportArrayStorage
+ * @codeCoverageIgnore
+ * @deprecated
  *
  */
 class ImportArrayStorage
diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php
index 2d495b20e2..e80a97fe7e 100644
--- a/app/Models/ImportJob.php
+++ b/app/Models/ImportJob.php
@@ -31,7 +31,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ImportJob.
- *
+ * @codeCoverageIgnore
+ * @deprecated
  * @property array  $transactions
  * @property array  $configuration
  * @property User   $user
diff --git a/app/Providers/ImportServiceProvider.php b/app/Providers/ImportServiceProvider.php
index 5a3e399c73..6e2fcc79a2 100644
--- a/app/Providers/ImportServiceProvider.php
+++ b/app/Providers/ImportServiceProvider.php
@@ -30,6 +30,7 @@ use Illuminate\Support\ServiceProvider;
 /**
  * @codeCoverageIgnore
  * Class ImportServiceProvider.
+ * @deprecated
  */
 class ImportServiceProvider extends ServiceProvider
 {
diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php
index 9716a9e4c2..b8ae64da08 100644
--- a/app/Repositories/ImportJob/ImportJobRepository.php
+++ b/app/Repositories/ImportJob/ImportJobRepository.php
@@ -37,6 +37,8 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Class ImportJobRepository.
+ * @codeCoverageIgnore
+ * @deprecated
  *
  */
 class ImportJobRepository implements ImportJobRepositoryInterface
diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php
index 76dfae1e51..4f585c78de 100644
--- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php
+++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php
@@ -32,6 +32,8 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Interface ImportJobRepositoryInterface.
+ * @codeCoverageIgnore
+ * @deprecated
  */
 interface ImportJobRepositoryInterface
 {
diff --git a/app/Services/Bunq/ApiContext.php b/app/Services/Bunq/ApiContext.php
index ea40d966c1..679b5b0b46 100644
--- a/app/Services/Bunq/ApiContext.php
+++ b/app/Services/Bunq/ApiContext.php
@@ -35,7 +35,9 @@ use Tests\Object\FakeApiContext;
  * Special class to hide away bunq's static initialisation methods.
  *
  * Class ApiContext
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ApiContext
 {
diff --git a/app/Services/Bunq/MonetaryAccount.php b/app/Services/Bunq/MonetaryAccount.php
index 369339731c..27cc131567 100644
--- a/app/Services/Bunq/MonetaryAccount.php
+++ b/app/Services/Bunq/MonetaryAccount.php
@@ -32,6 +32,7 @@ use FireflyIII\Exceptions\FireflyException;
 /**
  * Class MonetaryAccount
  * @codeCoverageIgnore
+ * @deprecated
  */
 class MonetaryAccount
 {
diff --git a/app/Services/Bunq/Payment.php b/app/Services/Bunq/Payment.php
index 9801cda9de..1ff540e7e9 100644
--- a/app/Services/Bunq/Payment.php
+++ b/app/Services/Bunq/Payment.php
@@ -32,6 +32,7 @@ use FireflyIII\Exceptions\FireflyException;
 /**
  * Class Payment
  * @codeCoverageIgnore
+ * @deprecated
  */
 class Payment
 {
diff --git a/app/Services/IP/IPRetrievalInterface.php b/app/Services/IP/IPRetrievalInterface.php
index 52f5cda9ef..d8d8899081 100644
--- a/app/Services/IP/IPRetrievalInterface.php
+++ b/app/Services/IP/IPRetrievalInterface.php
@@ -25,7 +25,8 @@ namespace FireflyIII\Services\IP;
 
 /**
  * Interface IPRetrievalInterface
- *
+ * @codeCoverageIgnore
+ * @deprecated
  */
 interface IPRetrievalInterface
 {
diff --git a/app/Services/IP/IpifyOrg.php b/app/Services/IP/IpifyOrg.php
index 6cb62cdbe2..1bfb54e1f0 100644
--- a/app/Services/IP/IpifyOrg.php
+++ b/app/Services/IP/IpifyOrg.php
@@ -31,7 +31,9 @@ use RuntimeException;
 
 /**
  * Class IpifyOrg
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class IpifyOrg implements IPRetrievalInterface
 {
diff --git a/app/Services/Password/PwndVerifierV3.php b/app/Services/Password/PwndVerifierV3.php
index b2534d64a1..817d9ccf2c 100644
--- a/app/Services/Password/PwndVerifierV3.php
+++ b/app/Services/Password/PwndVerifierV3.php
@@ -33,6 +33,8 @@ use RuntimeException;
 /**
  * Class PwndVerifierV3
  * @codeCoverageIgnore
+ * @codeCoverageIgnore
+ * @deprecated
  */
 class PwndVerifierV3 implements Verifier
 {
diff --git a/app/Services/Spectre/Exception/DuplicatedCustomerException.php b/app/Services/Spectre/Exception/DuplicatedCustomerException.php
index daccd12f19..8beb4cc17d 100644
--- a/app/Services/Spectre/Exception/DuplicatedCustomerException.php
+++ b/app/Services/Spectre/Exception/DuplicatedCustomerException.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Exception;
 /**
  * @codeCoverageIgnore
  * Class DuplicatedCustomerException
+ * @deprecated
  */
 class DuplicatedCustomerException extends SpectreException
 {
diff --git a/app/Services/Spectre/Exception/SpectreException.php b/app/Services/Spectre/Exception/SpectreException.php
index 02e422f5ae..73e0e22c81 100644
--- a/app/Services/Spectre/Exception/SpectreException.php
+++ b/app/Services/Spectre/Exception/SpectreException.php
@@ -28,6 +28,7 @@ use Exception;
 /**
  * @codeCoverageIgnore
  * Class SpectreException
+ * @deprecated
  */
 class SpectreException extends Exception
 {
diff --git a/app/Services/Spectre/Exception/WrongRequestFormatException.php b/app/Services/Spectre/Exception/WrongRequestFormatException.php
index 424ccc2356..5dce219a97 100644
--- a/app/Services/Spectre/Exception/WrongRequestFormatException.php
+++ b/app/Services/Spectre/Exception/WrongRequestFormatException.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Exception;
 /**
  * @codeCoverageIgnore
  * Class WrongRequestFormatException
+ * @deprecated
  */
 class WrongRequestFormatException extends SpectreException
 {
diff --git a/app/Services/Spectre/Object/Account.php b/app/Services/Spectre/Object/Account.php
index 3f6233bf98..2da7f1fd11 100644
--- a/app/Services/Spectre/Object/Account.php
+++ b/app/Services/Spectre/Object/Account.php
@@ -30,6 +30,7 @@ use Carbon\Carbon;
  *
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.ShortVariable)
+ * @deprecated
  */
 class Account extends SpectreObject
 {
diff --git a/app/Services/Spectre/Object/Attempt.php b/app/Services/Spectre/Object/Attempt.php
index 09a5e511b8..434ecfbbd8 100644
--- a/app/Services/Spectre/Object/Attempt.php
+++ b/app/Services/Spectre/Object/Attempt.php
@@ -32,6 +32,7 @@ use Carbon\Carbon;
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.ShortVariable)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @deprecated
  */
 class Attempt extends SpectreObject
 {
diff --git a/app/Services/Spectre/Object/Customer.php b/app/Services/Spectre/Object/Customer.php
index 57183dce1f..b526cd4195 100644
--- a/app/Services/Spectre/Object/Customer.php
+++ b/app/Services/Spectre/Object/Customer.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Services\Spectre\Object;
  *
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.ShortVariable)
+ * @deprecated
  */
 class Customer extends SpectreObject
 {
diff --git a/app/Services/Spectre/Object/Holder.php b/app/Services/Spectre/Object/Holder.php
index d0d93f6f53..8c2e739342 100644
--- a/app/Services/Spectre/Object/Holder.php
+++ b/app/Services/Spectre/Object/Holder.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Services\Spectre\Object;
  * Class Holder
  *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class Holder extends SpectreObject
 {
diff --git a/app/Services/Spectre/Object/Login.php b/app/Services/Spectre/Object/Login.php
index 4a475ae8f3..55d176cb24 100644
--- a/app/Services/Spectre/Object/Login.php
+++ b/app/Services/Spectre/Object/Login.php
@@ -32,6 +32,7 @@ use Carbon\Carbon;
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.ShortVariable)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @deprecated
  */
 class Login extends SpectreObject
 {
diff --git a/app/Services/Spectre/Object/SpectreObject.php b/app/Services/Spectre/Object/SpectreObject.php
index 5ec3932760..41030b0ff6 100644
--- a/app/Services/Spectre/Object/SpectreObject.php
+++ b/app/Services/Spectre/Object/SpectreObject.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Services\Spectre\Object;
 /**
  * @codeCoverageIgnore
  * Class SpectreObject
+ * @deprecated
  */
 class SpectreObject
 {
diff --git a/app/Services/Spectre/Object/Token.php b/app/Services/Spectre/Object/Token.php
index becc575153..f344c2c6be 100644
--- a/app/Services/Spectre/Object/Token.php
+++ b/app/Services/Spectre/Object/Token.php
@@ -28,6 +28,7 @@ use Carbon\Carbon;
 /**
  * @codeCoverageIgnore
  * Class Token
+ * @deprecated
  */
 class Token extends SpectreObject
 {
diff --git a/app/Services/Spectre/Object/Transaction.php b/app/Services/Spectre/Object/Transaction.php
index 6896558c4b..62fc784d2c 100644
--- a/app/Services/Spectre/Object/Transaction.php
+++ b/app/Services/Spectre/Object/Transaction.php
@@ -29,6 +29,7 @@ use Carbon\Carbon;
  * Class Transaction
  *
  * @codeCoverageIgnore
+ * @deprecated
  *
  * @SuppressWarnings(PHPMD.ShortVariable)
  */
diff --git a/app/Services/Spectre/Object/TransactionExtra.php b/app/Services/Spectre/Object/TransactionExtra.php
index 1fb9d38ffc..160b1247a0 100644
--- a/app/Services/Spectre/Object/TransactionExtra.php
+++ b/app/Services/Spectre/Object/TransactionExtra.php
@@ -31,6 +31,7 @@ use Carbon\Carbon;
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ShortVariable)
  * @codeCoverageIgnore
+ * @deprecated
  */
 class TransactionExtra extends SpectreObject
 {
diff --git a/app/Services/Spectre/Request/CreateTokenRequest.php b/app/Services/Spectre/Request/CreateTokenRequest.php
index 5c90ce3684..ff47245fd5 100644
--- a/app/Services/Spectre/Request/CreateTokenRequest.php
+++ b/app/Services/Spectre/Request/CreateTokenRequest.php
@@ -29,7 +29,9 @@ use FireflyIII\Services\Spectre\Object\Token;
 
 /**
  * Class CreateTokenRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class CreateTokenRequest extends SpectreRequest
 {
diff --git a/app/Services/Spectre/Request/ListAccountsRequest.php b/app/Services/Spectre/Request/ListAccountsRequest.php
index 66945560e2..95f870018e 100644
--- a/app/Services/Spectre/Request/ListAccountsRequest.php
+++ b/app/Services/Spectre/Request/ListAccountsRequest.php
@@ -30,7 +30,9 @@ use Log;
 
 /**
  * Class ListAccountsRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ListAccountsRequest extends SpectreRequest
 {
diff --git a/app/Services/Spectre/Request/ListCustomersRequest.php b/app/Services/Spectre/Request/ListCustomersRequest.php
index cbfd846643..6fd6a823c7 100644
--- a/app/Services/Spectre/Request/ListCustomersRequest.php
+++ b/app/Services/Spectre/Request/ListCustomersRequest.php
@@ -29,7 +29,9 @@ use Log;
 
 /**
  * Class ListCustomersRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ListCustomersRequest extends SpectreRequest
 {
diff --git a/app/Services/Spectre/Request/ListLoginsRequest.php b/app/Services/Spectre/Request/ListLoginsRequest.php
index d5492d91bc..9c310f7dd4 100644
--- a/app/Services/Spectre/Request/ListLoginsRequest.php
+++ b/app/Services/Spectre/Request/ListLoginsRequest.php
@@ -31,7 +31,9 @@ use Log;
 
 /**
  * Class ListLoginsRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ListLoginsRequest extends SpectreRequest
 {
diff --git a/app/Services/Spectre/Request/ListTransactionsRequest.php b/app/Services/Spectre/Request/ListTransactionsRequest.php
index a6763c1156..015599273a 100644
--- a/app/Services/Spectre/Request/ListTransactionsRequest.php
+++ b/app/Services/Spectre/Request/ListTransactionsRequest.php
@@ -30,7 +30,9 @@ use Log;
 
 /**
  * Class ListTransactionsRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ListTransactionsRequest extends SpectreRequest
 {
diff --git a/app/Services/Spectre/Request/NewCustomerRequest.php b/app/Services/Spectre/Request/NewCustomerRequest.php
index 9c4e10f687..1c7aa32ffc 100644
--- a/app/Services/Spectre/Request/NewCustomerRequest.php
+++ b/app/Services/Spectre/Request/NewCustomerRequest.php
@@ -27,7 +27,9 @@ use Log;
 
 /**
  * Class NewCustomerRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class NewCustomerRequest extends SpectreRequest
 {
diff --git a/app/Services/Spectre/Request/SpectreRequest.php b/app/Services/Spectre/Request/SpectreRequest.php
index 1298ee7f31..f9e959c237 100644
--- a/app/Services/Spectre/Request/SpectreRequest.php
+++ b/app/Services/Spectre/Request/SpectreRequest.php
@@ -32,7 +32,9 @@ use RuntimeException;
 
 /**
  * Class SpectreRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 abstract class SpectreRequest
 {
diff --git a/app/Services/Ynab/Request/GetAccountsRequest.php b/app/Services/Ynab/Request/GetAccountsRequest.php
index 29f7a833ca..147dd287a6 100644
--- a/app/Services/Ynab/Request/GetAccountsRequest.php
+++ b/app/Services/Ynab/Request/GetAccountsRequest.php
@@ -27,7 +27,9 @@ use Log;
 
 /**
  * Class GetAccountsRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class GetAccountsRequest extends YnabRequest
 {
diff --git a/app/Services/Ynab/Request/GetBudgetsRequest.php b/app/Services/Ynab/Request/GetBudgetsRequest.php
index 3e5476de99..b392964a69 100644
--- a/app/Services/Ynab/Request/GetBudgetsRequest.php
+++ b/app/Services/Ynab/Request/GetBudgetsRequest.php
@@ -27,7 +27,9 @@ use Log;
 
 /**
  * Class GetBudgetsRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class GetBudgetsRequest extends YnabRequest
 {
diff --git a/app/Services/Ynab/Request/GetTransactionsRequest.php b/app/Services/Ynab/Request/GetTransactionsRequest.php
index 9a31ac4108..3a3fe1a5ac 100644
--- a/app/Services/Ynab/Request/GetTransactionsRequest.php
+++ b/app/Services/Ynab/Request/GetTransactionsRequest.php
@@ -27,7 +27,9 @@ use Log;
 
 /**
  * Class GetTransactionsRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class GetTransactionsRequest extends YnabRequest
 {
diff --git a/app/Services/Ynab/Request/YnabRequest.php b/app/Services/Ynab/Request/YnabRequest.php
index 8e54242fe0..7a2034342f 100644
--- a/app/Services/Ynab/Request/YnabRequest.php
+++ b/app/Services/Ynab/Request/YnabRequest.php
@@ -30,7 +30,9 @@ use RuntimeException;
 
 /**
  * Class YnabRequest
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 abstract class YnabRequest
 {
diff --git a/app/Support/Binder/ImportProvider.php b/app/Support/Binder/ImportProvider.php
index 59ead7a4d0..9682f4b04a 100644
--- a/app/Support/Binder/ImportProvider.php
+++ b/app/Support/Binder/ImportProvider.php
@@ -31,6 +31,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ImportProvider.
+ *
+ * @deprecated
  */
 class ImportProvider implements BinderInterface
 {
diff --git a/app/Support/FinTS/FinTS.php b/app/Support/FinTS/FinTS.php
index 174032f488..91dfbe21ad 100644
--- a/app/Support/FinTS/FinTS.php
+++ b/app/Support/FinTS/FinTS.php
@@ -28,6 +28,7 @@ use Illuminate\Support\Facades\Crypt;
 
 /**
  * @codeCoverageIgnore
+ * @deprecated
  * Class FinTS
  */
 class FinTS
diff --git a/app/Support/FinTS/MetadataParser.php b/app/Support/FinTS/MetadataParser.php
index ea1155519b..6a079202cd 100644
--- a/app/Support/FinTS/MetadataParser.php
+++ b/app/Support/FinTS/MetadataParser.php
@@ -25,7 +25,8 @@ namespace FireflyIII\Support\FinTS;
 use Fhp\Model\StatementOfAccount\Transaction as FinTSTransaction;
 
 /**
- *
+ * @deprecated
+ * @codeCoverageIgnore
  * Class MetadataParser
  */
 class MetadataParser
diff --git a/app/Support/Import/Information/GetSpectreCustomerTrait.php b/app/Support/Import/Information/GetSpectreCustomerTrait.php
index 08e356b5f3..c2f0cd9058 100644
--- a/app/Support/Import/Information/GetSpectreCustomerTrait.php
+++ b/app/Support/Import/Information/GetSpectreCustomerTrait.php
@@ -32,7 +32,9 @@ use Log;
 
 /**
  * Trait GetSpectreCustomerTrait
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 trait GetSpectreCustomerTrait
 {
diff --git a/app/Support/Import/Information/GetSpectreTokenTrait.php b/app/Support/Import/Information/GetSpectreTokenTrait.php
index 4cfafb8d7e..875c905c8e 100644
--- a/app/Support/Import/Information/GetSpectreTokenTrait.php
+++ b/app/Support/Import/Information/GetSpectreTokenTrait.php
@@ -31,7 +31,9 @@ use Log;
 
 /**
  * Trait GetSpectreTokenTrait
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 trait GetSpectreTokenTrait
 {
diff --git a/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php b/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php
index fe315a1250..d662694c86 100644
--- a/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php
+++ b/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php
@@ -28,6 +28,8 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Interface BunqJobConfigurationInterface
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface BunqJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php
index fc0425cd6b..7cf82b10bb 100644
--- a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php
+++ b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php
@@ -36,6 +36,8 @@ use Log;
 
 /**
  * Class ChooseAccountsHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ChooseAccountsHandler implements BunqJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php b/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php
index 43df0f4245..847da7284d 100644
--- a/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php
+++ b/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php
@@ -30,6 +30,8 @@ use Log;
 
 /**
  * Class NewBunqJobHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class NewBunqJobHandler implements BunqJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php
index 278bb24905..8be440542a 100644
--- a/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php
+++ b/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php
@@ -39,6 +39,8 @@ use Log;
 
 /**
  * Class ConfigureMappingHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ConfigureMappingHandler implements FileConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php
index fbab577bc2..9c4bde5e66 100644
--- a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php
+++ b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php
@@ -38,6 +38,8 @@ use Log;
 
 /**
  * Class ConfigureRolesHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ConfigureRolesHandler implements FileConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php
index f6cb0da8ab..8bd2a610b5 100644
--- a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php
+++ b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php
@@ -32,6 +32,8 @@ use Log;
 
 /**
  * Class ConfigureUploadHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ConfigureUploadHandler implements FileConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/File/FileConfigurationInterface.php b/app/Support/Import/JobConfiguration/File/FileConfigurationInterface.php
index f516a8ef3a..ebde2cfc45 100644
--- a/app/Support/Import/JobConfiguration/File/FileConfigurationInterface.php
+++ b/app/Support/Import/JobConfiguration/File/FileConfigurationInterface.php
@@ -27,6 +27,8 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Class FileConfigurationInterface.
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface FileConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php b/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php
index f60b2a558f..fe8080df74 100644
--- a/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php
+++ b/app/Support/Import/JobConfiguration/File/NewFileJobHandler.php
@@ -36,6 +36,8 @@ use Log;
 
 /**
  * Class NewFileJobHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class NewFileJobHandler implements FileConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php b/app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php
index 7356b0edac..7e75cfe0e8 100644
--- a/app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php
+++ b/app/Support/Import/JobConfiguration/FinTS/ChooseAccountHandler.php
@@ -35,7 +35,9 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Class ChooseAccountHandler
+ *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ChooseAccountHandler implements FinTSConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/FinTS/FinTSConfigurationInterface.php b/app/Support/Import/JobConfiguration/FinTS/FinTSConfigurationInterface.php
index ce48e854ef..ef44396f69 100644
--- a/app/Support/Import/JobConfiguration/FinTS/FinTSConfigurationInterface.php
+++ b/app/Support/Import/JobConfiguration/FinTS/FinTSConfigurationInterface.php
@@ -26,7 +26,8 @@ use FireflyIII\Models\ImportJob;
 use Illuminate\Support\MessageBag;
 
 /**
- *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface FinTSConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php b/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php
index 91884c5fa6..67167a61fd 100644
--- a/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php
+++ b/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php
@@ -34,6 +34,7 @@ use Illuminate\Support\MessageBag;
 /**
  * Class NewFinTSJobHandler
  * @codeCoverageIgnore
+ * @deprecated
  */
 class NewFinTSJobHandler implements FinTSConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php b/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php
index 5b9267bb37..9fe4faf428 100644
--- a/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php
+++ b/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php
@@ -31,6 +31,7 @@ use Log;
  * @codeCoverageIgnore
  *
  * Class AuthenticatedHandler
+ * @deprecated
  */
 class AuthenticatedHandler implements SpectreJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php
index e736e468e9..25d57c1ec5 100644
--- a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php
+++ b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php
@@ -39,7 +39,8 @@ use Log;
 
 /**
  * Class ChooseAccountsHandler
- *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ChooseAccountsHandler implements SpectreJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php
index ba83a61e4e..e42fe7a0f7 100644
--- a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php
+++ b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php
@@ -35,7 +35,8 @@ use Log;
 
 /**
  * Class ChooseLoginHandler
- *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ChooseLoginHandler implements SpectreJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php b/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php
index afd5a945ea..ab0f441dd6 100644
--- a/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php
+++ b/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php
@@ -34,7 +34,8 @@ use Log;
 
 /**
  * Class AuthenticateConfig
- *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class DoAuthenticateHandler implements SpectreJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php b/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php
index 13e5ec1ada..b90c8e8007 100644
--- a/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php
+++ b/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php
@@ -32,7 +32,7 @@ use Log;
  * @codeCoverageIgnore
  *
  * Class NewSpectreJobHandler
- *
+ * @deprecated
  */
 class NewSpectreJobHandler implements SpectreJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php b/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php
index fcb02d0e1a..dc7846b0dd 100644
--- a/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php
+++ b/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php
@@ -29,7 +29,8 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Interface SpectreJobConfigurationInterface
- *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface SpectreJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Ynab/NewYnabJobHandler.php b/app/Support/Import/JobConfiguration/Ynab/NewYnabJobHandler.php
index ae069e7328..0b6cb4701a 100644
--- a/app/Support/Import/JobConfiguration/Ynab/NewYnabJobHandler.php
+++ b/app/Support/Import/JobConfiguration/Ynab/NewYnabJobHandler.php
@@ -34,6 +34,8 @@ use RuntimeException;
 
 /**
  * Class NewYnabJobHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class NewYnabJobHandler implements YnabJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Ynab/SelectAccountsHandler.php b/app/Support/Import/JobConfiguration/Ynab/SelectAccountsHandler.php
index 04dd3c55e9..dcadd72390 100644
--- a/app/Support/Import/JobConfiguration/Ynab/SelectAccountsHandler.php
+++ b/app/Support/Import/JobConfiguration/Ynab/SelectAccountsHandler.php
@@ -37,6 +37,8 @@ use Log;
 
 /**
  * Class SelectAccountsHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class SelectAccountsHandler implements YnabJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Ynab/SelectBudgetHandler.php b/app/Support/Import/JobConfiguration/Ynab/SelectBudgetHandler.php
index 3a7385f4ca..9a2790d270 100644
--- a/app/Support/Import/JobConfiguration/Ynab/SelectBudgetHandler.php
+++ b/app/Support/Import/JobConfiguration/Ynab/SelectBudgetHandler.php
@@ -35,6 +35,8 @@ use Log;
 
 /**
  * Class SelectBudgetHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class SelectBudgetHandler implements YnabJobConfigurationInterface
 {
diff --git a/app/Support/Import/JobConfiguration/Ynab/YnabJobConfigurationInterface.php b/app/Support/Import/JobConfiguration/Ynab/YnabJobConfigurationInterface.php
index 1124799f06..1752b566e6 100644
--- a/app/Support/Import/JobConfiguration/Ynab/YnabJobConfigurationInterface.php
+++ b/app/Support/Import/JobConfiguration/Ynab/YnabJobConfigurationInterface.php
@@ -28,7 +28,8 @@ use Illuminate\Support\MessageBag;
 
 /**
  * Interface YnabJobConfigurationInterface
- *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface YnabJobConfigurationInterface
 {
diff --git a/app/Support/Import/Placeholder/ColumnValue.php b/app/Support/Import/Placeholder/ColumnValue.php
index 79cff0e9b5..81fd343174 100644
--- a/app/Support/Import/Placeholder/ColumnValue.php
+++ b/app/Support/Import/Placeholder/ColumnValue.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Support\Import\Placeholder;
  * Class ColumnValue
  *
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ColumnValue
 {
diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php
index 9ad6e2b437..63155ff058 100644
--- a/app/Support/Import/Placeholder/ImportTransaction.php
+++ b/app/Support/Import/Placeholder/ImportTransaction.php
@@ -34,6 +34,7 @@ use Log;
 /**
  * Class ImportTransaction
  * @codeCoverageIgnore
+ * @deprecated
  */
 class ImportTransaction
 {
diff --git a/app/Support/Import/Routine/Bunq/PaymentConverter.php b/app/Support/Import/Routine/Bunq/PaymentConverter.php
index c11daac812..b40363c7a3 100644
--- a/app/Support/Import/Routine/Bunq/PaymentConverter.php
+++ b/app/Support/Import/Routine/Bunq/PaymentConverter.php
@@ -38,6 +38,8 @@ use Log;
 
 /**
  * Class PaymentConverter
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class PaymentConverter
 {
diff --git a/app/Support/Import/Routine/Bunq/StageImportDataHandler.php b/app/Support/Import/Routine/Bunq/StageImportDataHandler.php
index 3e28ed1719..199d05b7dd 100644
--- a/app/Support/Import/Routine/Bunq/StageImportDataHandler.php
+++ b/app/Support/Import/Routine/Bunq/StageImportDataHandler.php
@@ -38,6 +38,8 @@ use Log;
 
 /**
  * Class StageImportDataHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class StageImportDataHandler
 {
diff --git a/app/Support/Import/Routine/Bunq/StageNewHandler.php b/app/Support/Import/Routine/Bunq/StageNewHandler.php
index b7b35e453d..ab844508bc 100644
--- a/app/Support/Import/Routine/Bunq/StageNewHandler.php
+++ b/app/Support/Import/Routine/Bunq/StageNewHandler.php
@@ -41,6 +41,8 @@ use Log;
 
 /**
  * Class StageNewHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class StageNewHandler
 {
diff --git a/app/Support/Import/Routine/Fake/StageAhoyHandler.php b/app/Support/Import/Routine/Fake/StageAhoyHandler.php
index fe8fa979c2..a0a81f392b 100644
--- a/app/Support/Import/Routine/Fake/StageAhoyHandler.php
+++ b/app/Support/Import/Routine/Fake/StageAhoyHandler.php
@@ -28,6 +28,7 @@ use Log;
 /**
  * @codeCoverageIgnore
  * Class StageAhoyHandler
+ * @deprecated
  */
 class StageAhoyHandler
 {
diff --git a/app/Support/Import/Routine/Fake/StageFinalHandler.php b/app/Support/Import/Routine/Fake/StageFinalHandler.php
index 8beaf52836..f3bea38970 100644
--- a/app/Support/Import/Routine/Fake/StageFinalHandler.php
+++ b/app/Support/Import/Routine/Fake/StageFinalHandler.php
@@ -30,7 +30,7 @@ use FireflyIII\Models\ImportJob;
 /**
  * @codeCoverageIgnore
  * Class StageFinalHandler
- *
+ * @deprecated
  */
 class StageFinalHandler
 {
diff --git a/app/Support/Import/Routine/Fake/StageNewHandler.php b/app/Support/Import/Routine/Fake/StageNewHandler.php
index 0f54e32148..bf274d8f6e 100644
--- a/app/Support/Import/Routine/Fake/StageNewHandler.php
+++ b/app/Support/Import/Routine/Fake/StageNewHandler.php
@@ -28,6 +28,7 @@ use Log;
 /**
  * @codeCoverageIgnore
  * Class StageNewHandler
+ * @deprecated
  */
 class StageNewHandler
 {
diff --git a/app/Support/Import/Routine/File/AssetAccountMapper.php b/app/Support/Import/Routine/File/AssetAccountMapper.php
index 637accd2c0..b7c4398ae6 100644
--- a/app/Support/Import/Routine/File/AssetAccountMapper.php
+++ b/app/Support/Import/Routine/File/AssetAccountMapper.php
@@ -32,6 +32,7 @@ use Log;
 /**
  * Class AssetAccountMapper
  * Can also handle liability accounts.
+ * @deprecated
  */
 class AssetAccountMapper
 {
diff --git a/app/Support/Import/Routine/File/CSVProcessor.php b/app/Support/Import/Routine/File/CSVProcessor.php
index 4b69568139..225d16d0d6 100644
--- a/app/Support/Import/Routine/File/CSVProcessor.php
+++ b/app/Support/Import/Routine/File/CSVProcessor.php
@@ -30,7 +30,8 @@ use Log;
 
 /**
  * Class CSVProcessor
- *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class CSVProcessor implements FileProcessorInterface
 {
diff --git a/app/Support/Import/Routine/File/CurrencyMapper.php b/app/Support/Import/Routine/File/CurrencyMapper.php
index 08905feef9..89d8aebe90 100644
--- a/app/Support/Import/Routine/File/CurrencyMapper.php
+++ b/app/Support/Import/Routine/File/CurrencyMapper.php
@@ -30,6 +30,8 @@ use Log;
 
 /**
  * Class CurrencyMapper
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class CurrencyMapper
 {
diff --git a/app/Support/Import/Routine/File/FileProcessorInterface.php b/app/Support/Import/Routine/File/FileProcessorInterface.php
index f0404feb1c..5835f5ec9a 100644
--- a/app/Support/Import/Routine/File/FileProcessorInterface.php
+++ b/app/Support/Import/Routine/File/FileProcessorInterface.php
@@ -28,7 +28,8 @@ use FireflyIII\Models\ImportJob;
 
 /**
  * Interface FileProcessorInterface
- *
+ * @deprecated
+ * @codeCoverageIgnore
  */
 interface FileProcessorInterface
 {
diff --git a/app/Support/Import/Routine/File/ImportableConverter.php b/app/Support/Import/Routine/File/ImportableConverter.php
index aae7b45d9b..b512a66122 100644
--- a/app/Support/Import/Routine/File/ImportableConverter.php
+++ b/app/Support/Import/Routine/File/ImportableConverter.php
@@ -38,6 +38,8 @@ use Log;
 
 /**
  * Class ImportableConverter
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ImportableConverter
 {
diff --git a/app/Support/Import/Routine/File/ImportableCreator.php b/app/Support/Import/Routine/File/ImportableCreator.php
index 9730c2eb95..e86230a6c4 100644
--- a/app/Support/Import/Routine/File/ImportableCreator.php
+++ b/app/Support/Import/Routine/File/ImportableCreator.php
@@ -30,6 +30,7 @@ use FireflyIII\Support\Import\Placeholder\ImportTransaction;
  * Takes an array of arrays of ColumnValue objects and returns one (1) ImportTransaction
  * for each line.
  *
+ * @deprecated
  * @codeCoverageIgnore
  *
  * Class ImportableCreator
diff --git a/app/Support/Import/Routine/File/LineReader.php b/app/Support/Import/Routine/File/LineReader.php
index 857510da2a..b859dfcacb 100644
--- a/app/Support/Import/Routine/File/LineReader.php
+++ b/app/Support/Import/Routine/File/LineReader.php
@@ -36,6 +36,8 @@ use Log;
 
 /**
  * Class LineReader
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class LineReader
 {
diff --git a/app/Support/Import/Routine/File/MappedValuesValidator.php b/app/Support/Import/Routine/File/MappedValuesValidator.php
index bf8f9162a0..a3a23dc12d 100644
--- a/app/Support/Import/Routine/File/MappedValuesValidator.php
+++ b/app/Support/Import/Routine/File/MappedValuesValidator.php
@@ -35,6 +35,8 @@ use Log;
 
 /**
  * Class MappedValuesValidator
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class MappedValuesValidator
 {
diff --git a/app/Support/Import/Routine/File/MappingConverger.php b/app/Support/Import/Routine/File/MappingConverger.php
index b08341caff..3a127ed8e2 100644
--- a/app/Support/Import/Routine/File/MappingConverger.php
+++ b/app/Support/Import/Routine/File/MappingConverger.php
@@ -31,6 +31,8 @@ use Log;
 
 /**
  * Class MappingConverger
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class MappingConverger
 {
diff --git a/app/Support/Import/Routine/File/OFXProcessor.php b/app/Support/Import/Routine/File/OFXProcessor.php
index cb709025f2..0cb893f26a 100644
--- a/app/Support/Import/Routine/File/OFXProcessor.php
+++ b/app/Support/Import/Routine/File/OFXProcessor.php
@@ -35,6 +35,8 @@ use OfxParser\Entities\Transaction;
 /**
  *
  * Class OFXProcessor
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class OFXProcessor implements FileProcessorInterface
 {
diff --git a/app/Support/Import/Routine/File/OpposingAccountMapper.php b/app/Support/Import/Routine/File/OpposingAccountMapper.php
index 4219e56821..342a121e9e 100644
--- a/app/Support/Import/Routine/File/OpposingAccountMapper.php
+++ b/app/Support/Import/Routine/File/OpposingAccountMapper.php
@@ -31,6 +31,8 @@ use Log;
 
 /**
  * Class OpposingAccountMapper
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class OpposingAccountMapper
 {
diff --git a/app/Support/Import/Routine/FinTS/StageImportDataHandler.php b/app/Support/Import/Routine/FinTS/StageImportDataHandler.php
index 26997261fa..e2a0bf416d 100644
--- a/app/Support/Import/Routine/FinTS/StageImportDataHandler.php
+++ b/app/Support/Import/Routine/FinTS/StageImportDataHandler.php
@@ -41,6 +41,8 @@ use Illuminate\Support\Facades\Log;
 /**
  *
  * Class StageImportDataHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class StageImportDataHandler
 {
diff --git a/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php b/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php
index 68e7459735..d3dd29973d 100644
--- a/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php
+++ b/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php
@@ -35,6 +35,8 @@ use Log;
 
 /**
  * Class StageAuthenticatedHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class StageAuthenticatedHandler
 {
diff --git a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php
index e8706d07ca..4ee001ca45 100644
--- a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php
+++ b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php
@@ -38,6 +38,8 @@ use Log;
 
 /**
  * Class StageImportDataHandler
+ * @deprecated
+ * @codeCoverageIgnore
  *
  */
 class StageImportDataHandler
diff --git a/app/Support/Import/Routine/Spectre/StageNewHandler.php b/app/Support/Import/Routine/Spectre/StageNewHandler.php
index e675360d8f..74360cc154 100644
--- a/app/Support/Import/Routine/Spectre/StageNewHandler.php
+++ b/app/Support/Import/Routine/Spectre/StageNewHandler.php
@@ -33,6 +33,8 @@ use Log;
 
 /**
  * Class StageNewHandler
+ * @deprecated
+ * @codeCoverageIgnore
  *
  */
 class StageNewHandler
diff --git a/app/Support/Import/Routine/Ynab/GetAccountsHandler.php b/app/Support/Import/Routine/Ynab/GetAccountsHandler.php
index 009a974e23..b51aca4ed7 100644
--- a/app/Support/Import/Routine/Ynab/GetAccountsHandler.php
+++ b/app/Support/Import/Routine/Ynab/GetAccountsHandler.php
@@ -30,6 +30,8 @@ use FireflyIII\Services\Ynab\Request\GetAccountsRequest;
 
 /**
  * Class GetAccountsHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class GetAccountsHandler
 {
diff --git a/app/Support/Import/Routine/Ynab/ImportDataHandler.php b/app/Support/Import/Routine/Ynab/ImportDataHandler.php
index 95b11075f9..1e8d69b534 100644
--- a/app/Support/Import/Routine/Ynab/ImportDataHandler.php
+++ b/app/Support/Import/Routine/Ynab/ImportDataHandler.php
@@ -38,6 +38,8 @@ use Log;
 
 /**
  * Class ImportDataHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class ImportDataHandler
 {
diff --git a/app/Support/Import/Routine/Ynab/StageGetAccessHandler.php b/app/Support/Import/Routine/Ynab/StageGetAccessHandler.php
index 8145ad3b18..c775a00487 100644
--- a/app/Support/Import/Routine/Ynab/StageGetAccessHandler.php
+++ b/app/Support/Import/Routine/Ynab/StageGetAccessHandler.php
@@ -34,6 +34,8 @@ use RuntimeException;
 
 /**
  * Class StageGetAccessHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class StageGetAccessHandler
 {
diff --git a/app/Support/Import/Routine/Ynab/StageGetBudgetsHandler.php b/app/Support/Import/Routine/Ynab/StageGetBudgetsHandler.php
index e25aaa57bc..a0e0923966 100644
--- a/app/Support/Import/Routine/Ynab/StageGetBudgetsHandler.php
+++ b/app/Support/Import/Routine/Ynab/StageGetBudgetsHandler.php
@@ -31,6 +31,8 @@ use Log;
 
 /**
  * Class StageGetBudgetsHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class StageGetBudgetsHandler
 {
diff --git a/app/Support/Import/Routine/Ynab/StageGetTransactionsHandler.php b/app/Support/Import/Routine/Ynab/StageGetTransactionsHandler.php
index 5d4ec9f781..be8cdd7ff1 100644
--- a/app/Support/Import/Routine/Ynab/StageGetTransactionsHandler.php
+++ b/app/Support/Import/Routine/Ynab/StageGetTransactionsHandler.php
@@ -28,6 +28,8 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 
 /**
  * Class StageGetTransactionsHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class StageGetTransactionsHandler
 {
diff --git a/app/Support/Import/Routine/Ynab/StageMatchAccountsHandler.php b/app/Support/Import/Routine/Ynab/StageMatchAccountsHandler.php
index 9ab7a6361e..948b64a5bb 100644
--- a/app/Support/Import/Routine/Ynab/StageMatchAccountsHandler.php
+++ b/app/Support/Import/Routine/Ynab/StageMatchAccountsHandler.php
@@ -28,6 +28,8 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 
 /**
  * Class StageMatchAccountsHandler
+ * @deprecated
+ * @codeCoverageIgnore
  */
 class StageMatchAccountsHandler
 {
diff --git a/app/Transformers/ImportJobTransformer.php b/app/Transformers/ImportJobTransformer.php
index ef2259a2a1..b705e766d4 100644
--- a/app/Transformers/ImportJobTransformer.php
+++ b/app/Transformers/ImportJobTransformer.php
@@ -29,6 +29,7 @@ use Log;
 
 /**
  * Class ImportJobTransformer
+ * @deprecated
  */
 class ImportJobTransformer extends AbstractTransformer
 {