diff --git a/src/ApiResource/Accounting/Accounting.php b/src/ApiResource/Accounting/Accounting.php
index e009954..6b446bc 100644
--- a/src/ApiResource/Accounting/Accounting.php
+++ b/src/ApiResource/Accounting/Accounting.php
@@ -18,7 +18,6 @@ use App\State\Accounting\AccountingStateProvider;
  * perform corroboration of funds and store the Transactions into the system.
  */
 #[API\ApiResource(
-    shortName: 'Accounting',
     stateOptions: new Options(entityClass: Entity\Accounting::class),
     provider: AccountingStateProvider::class,
     processor: AccountingStateProcessor::class,
diff --git a/src/ApiResource/Gateway/Gateway.php b/src/ApiResource/Gateway/Gateway.php
index 6f9fbd7..c896c69 100644
--- a/src/ApiResource/Gateway/Gateway.php
+++ b/src/ApiResource/Gateway/Gateway.php
@@ -12,7 +12,7 @@ use App\State\Gateway\GatewayStateProvider;
  * These implementations make use of external or internal services to gather the funds that are inside a Transaction,
  * perform corroboration of funds and store the Transactions into the system.
  */
-#[API\ApiResource(shortName: 'Gateway')]
+#[API\ApiResource()]
 #[API\GetCollection(provider: GatewayStateProvider::class)]
 #[API\Get(provider: GatewayStateProvider::class)]
 class Gateway
diff --git a/src/Entity/WalletStatement.php b/src/Entity/WalletStatement.php
index e1e5a49..be15c70 100644
--- a/src/Entity/WalletStatement.php
+++ b/src/Entity/WalletStatement.php
@@ -2,7 +2,6 @@
 
 namespace App\Entity;
 
-use ApiPlatform\Metadata as API;
 use App\Entity\Accounting\Transaction;
 use App\Gateway\Wallet\StatementDirection;
 use App\Repository\WalletStatementRepository;
@@ -18,7 +17,6 @@ use Doctrine\ORM\Mapping as ORM;
  * a. Targets an User's Accounting, for which an incoming Statement will be created and which will hold the money until it is spent.\
  * b. Originates from an User's Accounting via the Wallet Gateway, which will create an outgoing Statement with money financed from previous incoming statements.
  */
-#[API\ApiResource()]
 #[ORM\Entity(repositoryClass: WalletStatementRepository::class)]
 class WalletStatement
 {
diff --git a/src/Gateway/Wallet/WalletGateway.php b/src/Gateway/Wallet/WalletGateway.php
index 2cf8e2c..02f4c1f 100644
--- a/src/Gateway/Wallet/WalletGateway.php
+++ b/src/Gateway/Wallet/WalletGateway.php
@@ -5,7 +5,6 @@ namespace App\Gateway\Wallet;
 use App\Entity\Accounting\Transaction;
 use App\Entity\Gateway\Checkout;
 use App\Entity\Money;
-use App\Entity\WalletStatement;
 use App\Gateway\ChargeType;
 use App\Gateway\GatewayInterface;
 use App\Library\Economy\MoneyService;