diff --git a/app/Services/Bunq/Id/BunqId.php b/app/Services/Bunq/Id/BunqId.php
index 76885d1633..e2d7338c54 100644
--- a/app/Services/Bunq/Id/BunqId.php
+++ b/app/Services/Bunq/Id/BunqId.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Services\Bunq\Id;
 
 /**
  * @codeCoverageIgnore
+ * @deprecated
  * Class BunqId.
  */
 class BunqId
diff --git a/app/Services/Bunq/Id/DeviceServerId.php b/app/Services/Bunq/Id/DeviceServerId.php
index dbc443f235..fec499bb85 100644
--- a/app/Services/Bunq/Id/DeviceServerId.php
+++ b/app/Services/Bunq/Id/DeviceServerId.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Services\Bunq\Id;
 
 /**
  * @codeCoverageIgnore
+ * @deprecated
  * Class DeviceServerId.
  */
 class DeviceServerId extends BunqId
diff --git a/app/Services/Bunq/Id/DeviceSessionId.php b/app/Services/Bunq/Id/DeviceSessionId.php
index 551d0feebf..54870850c5 100644
--- a/app/Services/Bunq/Id/DeviceSessionId.php
+++ b/app/Services/Bunq/Id/DeviceSessionId.php
@@ -24,6 +24,7 @@ namespace FireflyIII\Services\Bunq\Id;
 
 /**
  * @codeCoverageIgnore
+ * @deprecated
  * Class DeviceSessionId.
  */
 class DeviceSessionId extends BunqId
diff --git a/app/Services/Bunq/Id/InstallationId.php b/app/Services/Bunq/Id/InstallationId.php
index 14423dbf64..26a7b209f3 100644
--- a/app/Services/Bunq/Id/InstallationId.php
+++ b/app/Services/Bunq/Id/InstallationId.php
@@ -24,6 +24,7 @@ namespace FireflyIII\Services\Bunq\Id;
 
 /**
  * @codeCoverageIgnore
+ * @deprecated
  * Class InstallationId.
  */
 class InstallationId extends BunqId
diff --git a/app/Services/Bunq/Object/Alias.php b/app/Services/Bunq/Object/Alias.php
index 3e74db5af4..4dcfd5a0c6 100644
--- a/app/Services/Bunq/Object/Alias.php
+++ b/app/Services/Bunq/Object/Alias.php
@@ -24,6 +24,7 @@ namespace FireflyIII\Services\Bunq\Object;
 
 /**
  * @codeCoverageIgnore
+ * @deprecated
  * Class Alias.
  */
 class Alias extends BunqObject
diff --git a/app/Services/Bunq/Object/Amount.php b/app/Services/Bunq/Object/Amount.php
index 92dc420e35..3d5d7979d1 100644
--- a/app/Services/Bunq/Object/Amount.php
+++ b/app/Services/Bunq/Object/Amount.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Object;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class Amount.
  */
diff --git a/app/Services/Bunq/Object/Avatar.php b/app/Services/Bunq/Object/Avatar.php
index 051ad38e81..96e4cf50e5 100644
--- a/app/Services/Bunq/Object/Avatar.php
+++ b/app/Services/Bunq/Object/Avatar.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Object;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class Avatar.
  */
diff --git a/app/Services/Bunq/Object/BunqObject.php b/app/Services/Bunq/Object/BunqObject.php
index 2a275f7e57..364fed89cd 100644
--- a/app/Services/Bunq/Object/BunqObject.php
+++ b/app/Services/Bunq/Object/BunqObject.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Object;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class BunqObject.
  */
diff --git a/app/Services/Bunq/Object/DeviceServer.php b/app/Services/Bunq/Object/DeviceServer.php
index d865dc894a..064e38dcaf 100644
--- a/app/Services/Bunq/Object/DeviceServer.php
+++ b/app/Services/Bunq/Object/DeviceServer.php
@@ -28,6 +28,7 @@ use FireflyIII\Services\Bunq\Id\DeviceServerId;
 use FireflyIII\Exceptions\FireflyException;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class DeviceServer
  */
diff --git a/app/Services/Bunq/Object/Image.php b/app/Services/Bunq/Object/Image.php
index 96eb125460..79a73bdbe0 100644
--- a/app/Services/Bunq/Object/Image.php
+++ b/app/Services/Bunq/Object/Image.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Object;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class Image
  */
diff --git a/app/Services/Bunq/Object/LabelMonetaryAccount.php b/app/Services/Bunq/Object/LabelMonetaryAccount.php
index 253afea1b3..62fddca392 100644
--- a/app/Services/Bunq/Object/LabelMonetaryAccount.php
+++ b/app/Services/Bunq/Object/LabelMonetaryAccount.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Services\Bunq\Object;
 use FireflyIII\Exceptions\FireflyException;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class LabelMonetaryAccount
  */
diff --git a/app/Services/Bunq/Object/LabelUser.php b/app/Services/Bunq/Object/LabelUser.php
index 00b3456e53..f01a142ac4 100644
--- a/app/Services/Bunq/Object/LabelUser.php
+++ b/app/Services/Bunq/Object/LabelUser.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Services\Bunq\Object;
 
 use FireflyIII\Exceptions\FireflyException;
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class LabelUser
  */
diff --git a/app/Services/Bunq/Object/MonetaryAccountBank.php b/app/Services/Bunq/Object/MonetaryAccountBank.php
index 956398e245..0bd7e50f7d 100644
--- a/app/Services/Bunq/Object/MonetaryAccountBank.php
+++ b/app/Services/Bunq/Object/MonetaryAccountBank.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Services\Bunq\Object;
 use Carbon\Carbon;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class MonetaryAccountBank.
  */
diff --git a/app/Services/Bunq/Object/MonetaryAccountProfile.php b/app/Services/Bunq/Object/MonetaryAccountProfile.php
index aaac77ddc7..294742623c 100644
--- a/app/Services/Bunq/Object/MonetaryAccountProfile.php
+++ b/app/Services/Bunq/Object/MonetaryAccountProfile.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Object;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class MonetaryAccountProfile.
  */
diff --git a/app/Services/Bunq/Object/MonetaryAccountSetting.php b/app/Services/Bunq/Object/MonetaryAccountSetting.php
index f277ee4a79..38cb95fbd9 100644
--- a/app/Services/Bunq/Object/MonetaryAccountSetting.php
+++ b/app/Services/Bunq/Object/MonetaryAccountSetting.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Object;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class MonetaryAccountSetting.
  */
diff --git a/app/Services/Bunq/Object/NotificationFilter.php b/app/Services/Bunq/Object/NotificationFilter.php
index eeda1703c2..360de185fd 100644
--- a/app/Services/Bunq/Object/NotificationFilter.php
+++ b/app/Services/Bunq/Object/NotificationFilter.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Object;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class NotificationFilter.
  */
diff --git a/app/Services/Bunq/Object/Payment.php b/app/Services/Bunq/Object/Payment.php
index 86f416bfd6..01df0eb991 100644
--- a/app/Services/Bunq/Object/Payment.php
+++ b/app/Services/Bunq/Object/Payment.php
@@ -27,6 +27,7 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class Payment
  */
diff --git a/app/Services/Bunq/Object/ServerPublicKey.php b/app/Services/Bunq/Object/ServerPublicKey.php
index eef521a6ac..c1665400a3 100644
--- a/app/Services/Bunq/Object/ServerPublicKey.php
+++ b/app/Services/Bunq/Object/ServerPublicKey.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Object;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class ServerPublicKey.
  */
diff --git a/app/Services/Bunq/Object/UserCompany.php b/app/Services/Bunq/Object/UserCompany.php
index 9655be2537..25dcb6c9ab 100644
--- a/app/Services/Bunq/Object/UserCompany.php
+++ b/app/Services/Bunq/Object/UserCompany.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Services\Bunq\Object;
 use Carbon\Carbon;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class UserCompany.
  */
diff --git a/app/Services/Bunq/Object/UserLight.php b/app/Services/Bunq/Object/UserLight.php
index ffa9171bdc..521fc69a66 100644
--- a/app/Services/Bunq/Object/UserLight.php
+++ b/app/Services/Bunq/Object/UserLight.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Services\Bunq\Object;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class UserLight.
  */
diff --git a/app/Services/Bunq/Object/UserPerson.php b/app/Services/Bunq/Object/UserPerson.php
index e97a53306f..ec2bf6c61c 100644
--- a/app/Services/Bunq/Object/UserPerson.php
+++ b/app/Services/Bunq/Object/UserPerson.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Services\Bunq\Object;
 use Carbon\Carbon;
 
 /**
+ * @deprecated
  * @codeCoverageIgnore
  * Class UserPerson.
  */
diff --git a/app/Services/Bunq/Request/BunqRequest.php b/app/Services/Bunq/Request/BunqRequest.php
index f8a66a6347..5c02da3960 100644
--- a/app/Services/Bunq/Request/BunqRequest.php
+++ b/app/Services/Bunq/Request/BunqRequest.php
@@ -29,6 +29,8 @@ use Log;
 use Requests;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class BunqRequest.
  */
 abstract class BunqRequest
diff --git a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
index 758d0531e9..965f68620e 100644
--- a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
+++ b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php
@@ -26,6 +26,8 @@ use FireflyIII\Services\Bunq\Token\SessionToken;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class DeleteDeviceSessionRequest.
  */
 class DeleteDeviceSessionRequest extends BunqRequest
diff --git a/app/Services/Bunq/Request/DeviceServerRequest.php b/app/Services/Bunq/Request/DeviceServerRequest.php
index 5bb6f4e33f..367f9133cd 100644
--- a/app/Services/Bunq/Request/DeviceServerRequest.php
+++ b/app/Services/Bunq/Request/DeviceServerRequest.php
@@ -27,6 +27,8 @@ use FireflyIII\Services\Bunq\Token\InstallationToken;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class DeviceServerRequest.
  */
 class DeviceServerRequest extends BunqRequest
diff --git a/app/Services/Bunq/Request/DeviceSessionRequest.php b/app/Services/Bunq/Request/DeviceSessionRequest.php
index a8c34fe224..bd8c094f25 100644
--- a/app/Services/Bunq/Request/DeviceSessionRequest.php
+++ b/app/Services/Bunq/Request/DeviceSessionRequest.php
@@ -30,6 +30,8 @@ use FireflyIII\Services\Bunq\Token\InstallationToken;
 use FireflyIII\Services\Bunq\Token\SessionToken;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class DeviceSessionRequest.
  */
 class DeviceSessionRequest extends BunqRequest
diff --git a/app/Services/Bunq/Request/InstallationTokenRequest.php b/app/Services/Bunq/Request/InstallationTokenRequest.php
index d22614654a..0b9a2eb281 100644
--- a/app/Services/Bunq/Request/InstallationTokenRequest.php
+++ b/app/Services/Bunq/Request/InstallationTokenRequest.php
@@ -29,6 +29,8 @@ use FireflyIII\Services\Bunq\Token\InstallationToken;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class InstallationTokenRequest.
  */
 class InstallationTokenRequest extends BunqRequest
diff --git a/app/Services/Bunq/Request/ListDeviceServerRequest.php b/app/Services/Bunq/Request/ListDeviceServerRequest.php
index a143150ddf..39c20fdeb0 100644
--- a/app/Services/Bunq/Request/ListDeviceServerRequest.php
+++ b/app/Services/Bunq/Request/ListDeviceServerRequest.php
@@ -28,6 +28,8 @@ use Illuminate\Support\Collection;
 use Log;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class ListDeviceServerRequest.
  */
 class ListDeviceServerRequest extends BunqRequest
diff --git a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
index 6860a8a076..b1f6f69c8d 100644
--- a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
+++ b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php
@@ -27,6 +27,8 @@ use FireflyIII\Services\Bunq\Token\SessionToken;
 use Illuminate\Support\Collection;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class ListMonetaryAccountRequest.
  */
 class ListMonetaryAccountRequest extends BunqRequest
diff --git a/app/Services/Bunq/Request/ListPaymentRequest.php b/app/Services/Bunq/Request/ListPaymentRequest.php
index 9b3eb4ac6f..ca455daaa8 100644
--- a/app/Services/Bunq/Request/ListPaymentRequest.php
+++ b/app/Services/Bunq/Request/ListPaymentRequest.php
@@ -30,6 +30,8 @@ use Illuminate\Support\Collection;
 
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class ListPaymentRequest
  */
 class ListPaymentRequest extends BunqRequest
@@ -45,8 +47,6 @@ class ListPaymentRequest extends BunqRequest
     private $userId = 0;
 
     /**
-     * TODO support pagination.
-     * TODO impose limits on import.
      *
      * @throws \FireflyIII\Exceptions\FireflyException
      */
diff --git a/app/Services/Bunq/Request/ListUserRequest.php b/app/Services/Bunq/Request/ListUserRequest.php
index 32b3cdf32c..650e4f961f 100644
--- a/app/Services/Bunq/Request/ListUserRequest.php
+++ b/app/Services/Bunq/Request/ListUserRequest.php
@@ -28,6 +28,8 @@ use FireflyIII\Services\Bunq\Object\UserPerson;
 use FireflyIII\Services\Bunq\Token\SessionToken;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class ListUserRequest.
  */
 class ListUserRequest extends BunqRequest
diff --git a/app/Services/Bunq/Token/BunqToken.php b/app/Services/Bunq/Token/BunqToken.php
index a83716408d..c9d61e42aa 100644
--- a/app/Services/Bunq/Token/BunqToken.php
+++ b/app/Services/Bunq/Token/BunqToken.php
@@ -25,6 +25,8 @@ namespace FireflyIII\Services\Bunq\Token;
 use Carbon\Carbon;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class BunqToken.
  */
 class BunqToken
diff --git a/app/Services/Bunq/Token/InstallationToken.php b/app/Services/Bunq/Token/InstallationToken.php
index 2826658292..40bb8c7527 100644
--- a/app/Services/Bunq/Token/InstallationToken.php
+++ b/app/Services/Bunq/Token/InstallationToken.php
@@ -23,6 +23,8 @@ declare(strict_types=1);
 namespace FireflyIII\Services\Bunq\Token;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class InstallationToken.
  */
 class InstallationToken extends BunqToken
diff --git a/app/Services/Bunq/Token/SessionToken.php b/app/Services/Bunq/Token/SessionToken.php
index 46e9cf3e88..89f13272b5 100644
--- a/app/Services/Bunq/Token/SessionToken.php
+++ b/app/Services/Bunq/Token/SessionToken.php
@@ -25,6 +25,8 @@ namespace Bunq\Token;
 namespace FireflyIII\Services\Bunq\Token;
 
 /**
+ * @deprecated
+ * @codeCoverageIgnore
  * Class SessionToken.
  */
 class SessionToken extends BunqToken