diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php
index f3219657770..a725c7cfb77 100644
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -81,7 +81,6 @@ public function overview(ChartRequest $request): JsonResponse
         // move date to end of day
         $queryParameters['start']->startOfDay();
         $queryParameters['end']->endOfDay();
-        // Log::debug(sprintf('dashboard(), convert to primary: %s', var_export($this->convertToPrimary, true)));
 
         // loop each account, and collect info:
         /** @var Account $account */
diff --git a/app/Api/V1/Controllers/Chart/BalanceController.php b/app/Api/V1/Controllers/Chart/BalanceController.php
index d589be1661c..f8cec294bdf 100644
--- a/app/Api/V1/Controllers/Chart/BalanceController.php
+++ b/app/Api/V1/Controllers/Chart/BalanceController.php
@@ -31,7 +31,6 @@ class BalanceController extends Controller
     private GroupCollectorInterface    $collector;
     private AccountRepositoryInterface $repository;
 
-    // private TransactionCurrency        $default;
 
     public function __construct()
     {
diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.php
index 4102693d363..1f6597b36c3 100644
--- a/app/Api/V1/Controllers/Chart/BudgetController.php
+++ b/app/Api/V1/Controllers/Chart/BudgetController.php
@@ -248,7 +248,6 @@ private function processExpenses(int $budgetId, array $spent, Carbon $start, Car
             ];
             $currentBudgetArray = $block['budgets'][$budgetId];
 
-            // var_dump($return);
             /** @var array $journal */
             foreach ($currentBudgetArray['transaction_journals'] as $journal) {
                 $return[$currencyId]['spent'] = bcadd($return[$currencyId]['spent'], (string)$journal['amount']);
diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php
index 196cca92902..1fca75ecaee 100644
--- a/app/Api/V1/Controllers/Controller.php
+++ b/app/Api/V1/Controllers/Controller.php
@@ -283,7 +283,6 @@ final protected function jsonApiObject(string $key, array|Model $object, Abstrac
         $baseUrl  = sprintf('%s/api/v1', request()->getSchemeAndHttpHost());
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        // $transformer->collectMetaData(new Collection([$object]));
 
         $resource = new Item($object, $transformer, $key);
 
diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php
index 096ed01db77..070432af628 100644
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -106,7 +106,6 @@ public function basic(DateRequest $request): JsonResponse
         $billData     = $this->getSubscriptionInformation($start, $end);
         $spentData    = $this->getLeftToSpendInfo($start, $end);
         $netWorthData = $this->getNetWorthInfo($end);
-        //                        $balanceData  = [];
         //                        $billData     = [];
         //                $spentData    = [];
         //                        $netWorthData = [];
@@ -278,7 +277,7 @@ private function getBalanceInformation(Carbon $start, Carbon $end): array
                 'sub_title'               => '',
             ];
         }
-        if (0 === count($return)) {
+        if (empty($return)) {
             $currency = $this->primaryCurrency;
             // create objects for big array.
             $return[] = [
@@ -386,7 +385,6 @@ private function getSubscriptionInformation(Carbon $start, Carbon $end): array
             $unpaidAmount    = $newUnpaidAmount;
         }
 
-        //        var_dump($paidAmount);
         //        var_dump($unpaidAmount);
         //        exit;
 
@@ -431,7 +429,7 @@ private function getSubscriptionInformation(Carbon $start, Carbon $end): array
         }
         Log::debug(sprintf('Done with getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
 
-        if (0 === count($return)) {
+        if (empty($return)) {
             $currency = $this->primaryCurrency;
             unset($info, $amount);
 
@@ -530,7 +528,7 @@ private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
             ];
         }
         unset($leftToSpend);
-        if (0 === count($return)) {
+        if (empty($return)) {
             $days  = (int) $start->diffInDays($end, true) + 1;
             // a small trick to get every expense in this period, regardless of budget.
             $spent = $this->opsRepository->sumExpenses($start, $end, null, new Collection());
@@ -633,7 +631,7 @@ function (Account $account) {
                 'sub_title'               => '',
             ];
         }
-        if (0 === count($return)) {
+        if (empty($return)) {
             $return[] = [
                 'key'                     => sprintf('net-worth-in-%s', $this->primaryCurrency->code),
                 'title'                   => trans('firefly.box_net_worth_in_currency', ['currency' => $this->primaryCurrency->symbol]),
diff --git a/app/Api/V1/Requests/Chart/ChartRequest.php b/app/Api/V1/Requests/Chart/ChartRequest.php
index 2ef933a1c21..55aea133ebf 100644
--- a/app/Api/V1/Requests/Chart/ChartRequest.php
+++ b/app/Api/V1/Requests/Chart/ChartRequest.php
@@ -76,7 +76,6 @@ static function (Validator $validator): void {
                 // validate transaction query data.
                 $data = $validator->getData();
                 if (!array_key_exists('accounts', $data)) {
-                    // $validator->errors()->add('accounts', trans('validation.filled', ['attribute' => 'accounts']));
                     return;
                 }
                 if (!is_array($data['accounts'])) {
diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
index f16c5215902..4e3044686ca 100644
--- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php
@@ -113,7 +113,7 @@ private function getRepetitionData(): ?array
             }
             $return[] = $current;
         }
-        if (0 === count($return)) {
+        if (empty($return)) {
             return null;
         }
 
@@ -195,7 +195,6 @@ public function withValidator(Validator $validator): void
     {
         $validator->after(
             function (Validator $validator): void {
-                // $this->validateOneRecurrenceTransaction($validator);
                 // $this->validateOneRepetitionUpdate($validator);
 
                 /** @var Recurrence $recurrence */
diff --git a/app/Console/Commands/Correction/CorrectsUnevenAmount.php b/app/Console/Commands/Correction/CorrectsUnevenAmount.php
index 30a6107fe19..4f69ec0fad0 100644
--- a/app/Console/Commands/Correction/CorrectsUnevenAmount.php
+++ b/app/Console/Commands/Correction/CorrectsUnevenAmount.php
@@ -258,7 +258,6 @@ private function isForeignCurrencyTransfer(TransactionJournal $journal): bool
         // dest amount = source foreign currency
         // dest currency = source foreign currency
 
-        //        Log::debug(sprintf('[a] %s', bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount))));
         //        Log::debug(sprintf('[b] %s', bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount))));
         //        Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true)));
         //        Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int)  $source->foreign_currency_id, true)));
@@ -406,7 +405,6 @@ private function convertOldStyleTransactions(): void
                 $source->foreign_currency_id     = $currency;
                 $source->saveQuietly();
                 $source->refresh();
-                //                Log::debug(sprintf('source->amount                  = %s', $source->amount));
                 //                Log::debug(sprintf('source->transaction_currency_id = %s', $source->transaction_currency_id));
                 //                Log::debug(sprintf('source->foreign_amount          = %s', $source->foreign_amount));
                 //                Log::debug(sprintf('source->foreign_currency_id     = %s', $source->foreign_currency_id));
@@ -426,7 +424,6 @@ private function convertOldStyleTransactions(): void
                 $destination->balance_dirty           = true;
                 $destination->saveQuietly();
                 $destination->refresh();
-                //                Log::debug(sprintf('destination->amount                  = %s', $destination->amount));
                 //                Log::debug(sprintf('destination->transaction_currency_id = %s', $destination->transaction_currency_id));
                 //                Log::debug(sprintf('destination->foreign_amount          = %s', $destination->foreign_amount));
                 //                Log::debug(sprintf('destination->foreign_currency_id     = %s', $destination->foreign_currency_id));
diff --git a/app/Console/Commands/Correction/RemovesOrphanedTransactions.php b/app/Console/Commands/Correction/RemovesOrphanedTransactions.php
index f44ee5fb0d1..825301c6f39 100644
--- a/app/Console/Commands/Correction/RemovesOrphanedTransactions.php
+++ b/app/Console/Commands/Correction/RemovesOrphanedTransactions.php
@@ -65,7 +65,6 @@ private function deleteOrphanedJournals(): void
         ;
         $count = $set->count();
         if (0 === $count) {
-            // $this->friendlyPositive('No orphaned journals.');
 
             return;
         }
diff --git a/app/Entities/AccountBalance.php b/app/Entities/AccountBalance.php
index b7e62471261..fa5bda53a14 100644
--- a/app/Entities/AccountBalance.php
+++ b/app/Entities/AccountBalance.php
@@ -36,7 +36,6 @@ public static function fromArray(): self
     {
         $balance             = new self();
         $balance->id         = (string) random_int(1, 1000);
-        // $balance->name       = (string) random_int(1, 1000);
         $balance->amount     = (string) random_int(1, 1000);
         $balance->currencyId = '1';
 
diff --git a/app/Factory/PiggyBankFactory.php b/app/Factory/PiggyBankFactory.php
index 539e1999b8b..b5d24d31728 100644
--- a/app/Factory/PiggyBankFactory.php
+++ b/app/Factory/PiggyBankFactory.php
@@ -290,7 +290,7 @@ public function linkToAccountIds(PiggyBank $piggyBank, array $accounts): void
             }
         }
         Log::debug(sprintf('Link information: %s', json_encode($toBeLinked)));
-        if (0 !== count($toBeLinked)) {
+        if (!empty($toBeLinked)) {
             Log::debug('Syncing accounts to piggy bank.');
             $piggyBank->accounts()->sync($toBeLinked);
             $piggyBank->refresh();
@@ -302,7 +302,7 @@ public function linkToAccountIds(PiggyBank $piggyBank, array $accounts): void
                 event(new ChangedAmount($piggyBank, bcsub($newSavedAmount, $oldSavedAmount), null, null));
             }
         }
-        if (0 === count($toBeLinked)) {
+        if (empty($toBeLinked)) {
             Log::warning('No accounts to link to piggy bank, will not change whatever is there now.');
         }
     }
diff --git a/app/Factory/TransactionJournalMetaFactory.php b/app/Factory/TransactionJournalMetaFactory.php
index 56dd79d1e05..c3419db0f42 100644
--- a/app/Factory/TransactionJournalMetaFactory.php
+++ b/app/Factory/TransactionJournalMetaFactory.php
@@ -34,13 +34,11 @@ class TransactionJournalMetaFactory
 {
     public function updateOrCreate(array $data): ?TransactionJournalMeta
     {
-        // app('log')->debug('In updateOrCreate()');
         $value       = $data['data'];
 
         /** @var null|TransactionJournalMeta $entry */
         $entry       = $data['journal']->transactionJournalMeta()->where('name', $data['name'])->first();
         if (null === $value && null !== $entry) {
-            // app('log')->debug('Value is empty, delete meta value.');
             $entry->delete();
 
             return null;
@@ -62,7 +60,6 @@ public function updateOrCreate(array $data): ?TransactionJournalMeta
         }
 
         if (null === $entry) {
-            // app('log')->debug('Will create new object.');
             app('log')->debug(sprintf('Going to create new meta-data entry to store "%s".', $data['name']));
             $entry       = new TransactionJournalMeta();
             $entry->transactionJournal()->associate($data['journal']);
diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php
index bc02d217a83..dad07706125 100644
--- a/app/Generator/Report/Audit/MonthReportGenerator.php
+++ b/app/Generator/Report/Audit/MonthReportGenerator.php
@@ -179,7 +179,7 @@ public function getAuditReport(Account $account, Carbon $date): array
         return [
             'journals'         => $journals,
             'currency'         => $currency,
-            'exists'           => 0 !== count($journals),
+            'exists'           => !empty($journals),
             'end'              => $this->end->isoFormat((string) trans('config.month_and_day_moment_js', [], $locale)),
             'endBalance'       => Steam::finalAccountBalance($account, $this->end)['balance'],
             'dayBefore'        => $date->isoFormat((string) trans('config.month_and_day_moment_js', [], $locale)),
diff --git a/app/Handlers/Events/BillEventHandler.php b/app/Handlers/Events/BillEventHandler.php
index 6a96bf29a75..79be40aa550 100644
--- a/app/Handlers/Events/BillEventHandler.php
+++ b/app/Handlers/Events/BillEventHandler.php
@@ -70,7 +70,7 @@ public function warnAboutOverdueSubscriptions(WarnUserAboutOverdueSubscriptions
             return;
         }
         Log::debug(sprintf('Will warn about %d overdue subscription(s).', count($toBeWarned)));
-        if (0 === count($toBeWarned)) {
+        if (empty($toBeWarned)) {
             Log::debug('No overdue subscriptions to warn about.');
 
             return;
diff --git a/app/Handlers/Observer/AccountObserver.php b/app/Handlers/Observer/AccountObserver.php
index b29983ada59..08639f3ab62 100644
--- a/app/Handlers/Observer/AccountObserver.php
+++ b/app/Handlers/Observer/AccountObserver.php
@@ -43,7 +43,6 @@ class AccountObserver
 {
     public function created(Account $account): void
     {
-        //        Log::debug('Observe "created" of an account.');
         $this->updatePrimaryCurrencyAmount($account);
     }
 
@@ -67,7 +66,6 @@ private function updatePrimaryCurrencyAmount(Account $account): void
             $account->native_virtual_balance = null;
         }
         $account->saveQuietly();
-        // Log::debug('Account primary currency virtual balance is updated.');
     }
 
     /**
@@ -107,7 +105,6 @@ public function deleting(Account $account): void
 
     public function updated(Account $account): void
     {
-        //        Log::debug('Observe "updated" of an account.');
         $this->updatePrimaryCurrencyAmount($account);
     }
 }
diff --git a/app/Handlers/Observer/AvailableBudgetObserver.php b/app/Handlers/Observer/AvailableBudgetObserver.php
index 02fc32d0b18..3519288f7a8 100644
--- a/app/Handlers/Observer/AvailableBudgetObserver.php
+++ b/app/Handlers/Observer/AvailableBudgetObserver.php
@@ -33,14 +33,12 @@ class AvailableBudgetObserver
 {
     public function created(AvailableBudget $availableBudget): void
     {
-        // Log::debug('Observe "created" of an available budget.');
         $this->updatePrimaryCurrencyAmount($availableBudget);
     }
 
     private function updatePrimaryCurrencyAmount(AvailableBudget $availableBudget): void
     {
         if (!Amount::convertToPrimary($availableBudget->user)) {
-            // Log::debug('Do not update primary currency available amount of the available budget.');
 
             return;
         }
@@ -58,7 +56,6 @@ private function updatePrimaryCurrencyAmount(AvailableBudget $availableBudget):
 
     public function updated(AvailableBudget $availableBudget): void
     {
-        // Log::debug('Observe "updated" of an available budget.');
         $this->updatePrimaryCurrencyAmount($availableBudget);
     }
 }
diff --git a/app/Handlers/Observer/BillObserver.php b/app/Handlers/Observer/BillObserver.php
index 9d7d5f96723..24b2a2886a7 100644
--- a/app/Handlers/Observer/BillObserver.php
+++ b/app/Handlers/Observer/BillObserver.php
@@ -37,7 +37,6 @@ class BillObserver
 {
     public function created(Bill $bill): void
     {
-        //        Log::debug('Observe "created" of a bill.');
         $this->updatePrimaryCurrencyAmount($bill);
     }
 
@@ -65,7 +64,6 @@ public function deleting(Bill $bill): void
         $repository = app(AttachmentRepositoryInterface::class);
         $repository->setUser($bill->user);
 
-        //        app('log')->debug('Observe "deleting" of a bill.');
         /** @var Attachment $attachment */
         foreach ($bill->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
@@ -75,7 +73,6 @@ public function deleting(Bill $bill): void
 
     public function updated(Bill $bill): void
     {
-        //        Log::debug('Observe "updated" of a bill.');
         $this->updatePrimaryCurrencyAmount($bill);
     }
 }
diff --git a/app/Handlers/Observer/BudgetLimitObserver.php b/app/Handlers/Observer/BudgetLimitObserver.php
index f6fcc85f03e..807c5565019 100644
--- a/app/Handlers/Observer/BudgetLimitObserver.php
+++ b/app/Handlers/Observer/BudgetLimitObserver.php
@@ -59,7 +59,6 @@ public function created(BudgetLimit $budgetLimit): void
     private function updatePrimaryCurrencyAmount(BudgetLimit $budgetLimit): void
     {
         if (!Amount::convertToPrimary($budgetLimit->budget->user)) {
-            // Log::debug('Do not update primary currency amount of the budget limit.');
 
             return;
         }
diff --git a/app/Handlers/Observer/TransactionObserver.php b/app/Handlers/Observer/TransactionObserver.php
index a5c5fefd732..3867213a2d6 100644
--- a/app/Handlers/Observer/TransactionObserver.php
+++ b/app/Handlers/Observer/TransactionObserver.php
@@ -83,7 +83,6 @@ public function deleting(?Transaction $transaction): void
 
     public function updated(Transaction $transaction): void
     {
-        //        Log::debug('Observe "updated" of a transaction.');
         if (true === config('firefly.feature_flags.running_balance_column') && true === self::$recalculate) {
             if (1 === bccomp($transaction->amount, '0')) {
                 Log::debug('Trigger recalculateForJournal');
diff --git a/app/Helpers/Collector/Extensions/AccountCollection.php b/app/Helpers/Collector/Extensions/AccountCollection.php
index 2328b5dabcf..c00c90b3c10 100644
--- a/app/Helpers/Collector/Extensions/AccountCollection.php
+++ b/app/Helpers/Collector/Extensions/AccountCollection.php
@@ -179,7 +179,6 @@ static function (EloquentBuilder $query) use ($accountIds): void { // @phpstan-i
                     $query->orWhereIn('destination.account_id', $accountIds);
                 }
             );
-            // app('log')->debug(sprintf('GroupCollector: setAccounts: %s', implode(', ', $accountIds)));
         }
 
         return $this;
@@ -232,7 +231,6 @@ static function (EloquentBuilder $query) use ($accountIds): void { // @phpstan-i
                     $query->whereNotIn('destination.account_id', $accountIds);
                 }
             );
-            // app('log')->debug(sprintf('GroupCollector: setAccounts: %s', implode(', ', $accountIds)));
         }
 
         return $this;
diff --git a/app/Helpers/Collector/Extensions/AttachmentCollection.php b/app/Helpers/Collector/Extensions/AttachmentCollection.php
index 7738fd305fe..f907b993727 100644
--- a/app/Helpers/Collector/Extensions/AttachmentCollection.php
+++ b/app/Helpers/Collector/Extensions/AttachmentCollection.php
@@ -93,7 +93,6 @@ private function joinAttachmentTables(): void
                 ->where(
                     static function (EloquentBuilder $q1): void { // @phpstan-ignore-line
                         $q1->where('attachments.attachable_type', TransactionJournal::class);
-                        // $q1->where('attachments.uploaded', true);
                         $q1->whereNull('attachments.deleted_at');
                         $q1->orWhereNull('attachments.attachable_type');
                     }
diff --git a/app/Helpers/Collector/Extensions/MetaCollection.php b/app/Helpers/Collector/Extensions/MetaCollection.php
index 5e6dd7e85cc..095d9f6755a 100644
--- a/app/Helpers/Collector/Extensions/MetaCollection.php
+++ b/app/Helpers/Collector/Extensions/MetaCollection.php
@@ -328,7 +328,6 @@ public function externalUrlDoesNotStart(string $url): GroupCollectorInterface
         $this->joinMetaDataTables();
         $url = (string) json_encode($url);
         $url = str_replace('\\', '\\\\', rtrim($url, '"'));
-        // var_dump($url);
 
         $this->query->where('journal_meta.name', '=', 'external_url');
         $this->query->whereNotLike('journal_meta.data', sprintf('%s%%', $url));
@@ -352,7 +351,6 @@ public function externalUrlStarts(string $url): GroupCollectorInterface
         $this->joinMetaDataTables();
         $url = (string) json_encode($url);
         $url = str_replace('\\', '\\\\', rtrim($url, '"'));
-        // var_dump($url);
 
         $this->query->where('journal_meta.name', '=', 'external_url');
         $this->query->whereLike('journal_meta.data', sprintf('%s%%', $url));
@@ -403,7 +401,6 @@ public function internalReferenceContains(string $internalReference): GroupColle
     {
         $internalReference = (string) json_encode($internalReference);
         $internalReference = str_replace('\\', '\\\\', trim($internalReference, '"'));
-        // var_dump($internalReference);
         // exit;
 
         $this->joinMetaDataTables();
diff --git a/app/Helpers/Collector/GroupCollector.php b/app/Helpers/Collector/GroupCollector.php
index 59b27487309..b8cb436063a 100644
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -368,7 +368,7 @@ public function excludeIds(array $groupIds): GroupCollectorInterface
      */
     public function excludeJournalIds(array $journalIds): GroupCollectorInterface
     {
-        if (0 !== count($journalIds)) {
+        if (!empty($journalIds)) {
             // make all integers.
             $integerIDs = array_map('intval', $journalIds);
 
@@ -383,7 +383,7 @@ public function excludeJournalIds(array $journalIds): GroupCollectorInterface
      */
     public function excludeSearchWords(array $array): GroupCollectorInterface
     {
-        if (0 === count($array)) {
+        if (empty($array)) {
             Log::debug('No excluded search words provided, skipping.');
 
             return $this;
@@ -871,7 +871,6 @@ public function getPaginatedGroups(): LengthAwarePaginator
     public function setLimit(int $limit): GroupCollectorInterface
     {
         $this->limit = $limit;
-        // app('log')->debug(sprintf('GroupCollector: The limit is now %d', $limit));
 
         return $this;
     }
@@ -941,7 +940,7 @@ public function setIds(array $groupIds): GroupCollectorInterface
      */
     public function setJournalIds(array $journalIds): GroupCollectorInterface
     {
-        if (0 !== count($journalIds)) {
+        if (!empty($journalIds)) {
             // make all integers.
             $integerIDs = array_map('intval', $journalIds);
             Log::debug(sprintf('GroupCollector: setJournalIds: %s', implode(', ', $integerIDs)));
@@ -969,7 +968,6 @@ public function setPage(int $page): GroupCollectorInterface
     {
         $page       = 0 === $page ? 1 : $page;
         $this->page = $page;
-        // app('log')->debug(sprintf('GroupCollector: page is now %d', $page));
 
         return $this;
     }
@@ -979,7 +977,7 @@ public function setPage(int $page): GroupCollectorInterface
      */
     public function setSearchWords(array $array): GroupCollectorInterface
     {
-        if (0 === count($array)) {
+        if (empty($array)) {
             Log::debug('No words in array');
 
             return $this;
@@ -1062,7 +1060,6 @@ public function setUser(User $user): GroupCollectorInterface
      */
     private function startQuery(): void
     {
-        // app('log')->debug('GroupCollector::startQuery');
         $this->query = $this->user
             // ->transactionGroups()
             // ->leftJoin('transaction_journals', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
@@ -1126,7 +1123,6 @@ public function setUserGroup(UserGroup $userGroup): GroupCollectorInterface
      */
     private function startQueryForGroup(): void
     {
-        // app('log')->debug('GroupCollector::startQuery');
         $this->query = $this->userGroup
             ->transactionJournals()
             ->leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
diff --git a/app/Helpers/Fiscal/FiscalHelper.php b/app/Helpers/Fiscal/FiscalHelper.php
index 13c9d14bdc0..748574c4735 100644
--- a/app/Helpers/Fiscal/FiscalHelper.php
+++ b/app/Helpers/Fiscal/FiscalHelper.php
@@ -46,7 +46,6 @@ public function __construct()
      */
     public function endOfFiscalYear(Carbon $date): Carbon
     {
-        // app('log')->debug(sprintf('Now in endOfFiscalYear(%s).', $date->format('Y-m-d')));
         $endDate = $this->startOfFiscalYear($date);
         if (true === $this->useCustomFiscalYear) {
             // add 1 year and sub 1 day
@@ -56,7 +55,6 @@ public function endOfFiscalYear(Carbon $date): Carbon
         if (false === $this->useCustomFiscalYear) {
             $endDate->endOfYear();
         }
-        // app('log')->debug(sprintf('Result of endOfFiscalYear(%s) = %s', $date->format('Y-m-d'), $endDate->format('Y-m-d')));
 
         return $endDate;
     }
@@ -86,7 +84,6 @@ public function startOfFiscalYear(Carbon $date): Carbon
             $startDate->startOfYear();
         }
 
-        // app('log')->debug(sprintf('Result of startOfFiscalYear(%s) = %s', $date->format('Y-m-d'), $startDate->format('Y-m-d')));
 
         return $startDate;
     }
diff --git a/app/Helpers/Report/NetWorth.php b/app/Helpers/Report/NetWorth.php
index c3a2f0592cc..4c10702c65b 100644
--- a/app/Helpers/Report/NetWorth.php
+++ b/app/Helpers/Report/NetWorth.php
@@ -82,7 +82,6 @@ public function byAccounts(Collection $accounts, Carbon $date): array
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            //            Log::debug(sprintf('Now at account #%d ("%s")', $account->id, $account->name));
             $currency                           = $this->accountRepository->getAccountCurrency($account) ?? $primary;
             $usePrimary                         = $convertToPrimary && $primary->id !== $currency->id;
             $currency                           = $usePrimary ? $primary : $currency;
@@ -98,7 +97,6 @@ public function byAccounts(Collection $accounts, Carbon $date): array
             $balance                            = '' !== (string) $account->virtual_balance ? bcsub($balance, (string) $account->virtual_balance) : $balance;
             $primaryBalance                     = '' !== (string) $account->native_virtual_balance ? bcsub($primaryBalance, (string) $account->native_virtual_balance) : $primaryBalance;
             $amountToUse                        = $usePrimary ? $primaryBalance : $balance;
-            //            Log::debug(sprintf('Will use %s %s', $currencyCode, $amountToUse));
 
             $netWorth[$currencyCode] ??= [
                 'balance'                 => '0',
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 07abf76b4db..df3c9eaf9c4 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -225,7 +225,6 @@ public function update(UserFormRequest $request, User $user)
         app('log')->debug('Actually here');
         $data     = $request->getUserData();
 
-        // var_dump($data);
 
         // update password
         if (array_key_exists('password', $data) && '' !== $data['password']) {
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 00f387d7c46..f81fc6e902b 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -121,7 +121,6 @@ public function expenseAccounts(): JsonResponse
         Log::debug('Done collecting balances');
         // loop the accounts, then check for balance and currency info.
         foreach ($accounts as $account) {
-            // Log::debug(sprintf('[a] Now in account #%d ("%s")', $account->id, $account->name));
             $expenses = $endBalances[$account->id] ?? false;
             if (false === $expenses) {
                 Log::error(sprintf('Found no end balance for account #%d', $account->id));
@@ -135,23 +134,19 @@ public function expenseAccounts(): JsonResponse
              */
             foreach ($expenses as $key => $endBalance) {
                 if (!$this->convertToPrimary && 'pc_balance' === $key) {
-                    //                    Log::debug(sprintf('[a] Will skip expense array "%s"', $key));
 
                     continue;
                 }
                 if ($this->convertToPrimary && 'pc_balance' !== $key) {
-                    //                    Log::debug(sprintf('[b] Will skip expense array "%s"', $key));
 
                     continue;
                 }
-                // Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
                 $searchCode   = $this->convertToPrimary ? $this->primaryCurrency->code : $key;
                 $searchCode   = 'balance' === $searchCode || 'pc_balance' === $searchCode ? $this->primaryCurrency->code : $searchCode;
                 // Log::debug(sprintf('Search code is %s', $searchCode));
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
                 $startBalance = ($startBalances[$account->id][$key] ?? '0');
-                //                Log::debug(sprintf('Start balance is %s', $startBalance));
                 $diff         = bcsub($endBalance, $startBalance);
                 $currencies[$searchCode] ??= $this->currencyRepository->findByCode($searchCode);
                 if (0 !== bccomp($diff, '0')) {
@@ -382,7 +377,6 @@ public function frontpage(AccountRepositoryInterface $repository): JsonResponse
         $start          = clone session('start', today(config('app.timezone'))->startOfMonth());
         $end            = clone session('end', today(config('app.timezone'))->endOfMonth());
         $defaultSet     = $repository->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
-        // Log::debug('Default set is ', $defaultSet);
         $frontpage      = Preferences::get('frontpageAccounts', $defaultSet);
         $frontpageArray = !is_array($frontpage->data) ? [] : $frontpage->data;
         Log::debug('Frontpage preference set is ', $frontpageArray);
@@ -536,7 +530,6 @@ public function period(Account $account, Carbon $start, Carbon $end): JsonRespon
         Log::debug(sprintf('Start of loop, $carbon is %s', $carbon->format('Y-m-d H:i:s')));
         while ($end->gte($current)) {
             $momentBalance = $previous;
-            // $theDate       = $current->format('Y-m-d');
             Log::debug(sprintf('Now at %s, with momentBalance %s', $current->format('Y-m-d H:i:s'), json_encode($momentBalance)));
 
             // loop over the array with balances, find one that is earlier or on the same day.
@@ -662,7 +655,6 @@ public function revenueAccounts(): JsonResponse
 
         // loop the accounts, then check for balance and currency info.
         foreach ($accounts as $account) {
-            // Log::debug(sprintf('[b] Now in account #%d ("%s")', $account->id, $account->name));
             $expenses = $endBalances[$account->id] ?? false;
             if (false === $expenses) {
                 Log::error(sprintf('Found no end balance for account #%d', $account->id));
@@ -676,23 +668,19 @@ public function revenueAccounts(): JsonResponse
              */
             foreach ($expenses as $key => $endBalance) {
                 if (!$this->convertToPrimary && 'pc_balance' === $key) {
-                    //                    Log::debug(sprintf('[a] Will skip expense array "%s"', $key));
 
                     continue;
                 }
                 if ($this->convertToPrimary && 'pc_balance' !== $key) {
-                    //                    Log::debug(sprintf('[b] Will skip expense array "%s"', $key));
 
                     continue;
                 }
-                // Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
                 $searchCode   = $this->convertToPrimary ? $this->primaryCurrency->code : $key;
                 $searchCode   = 'balance' === $searchCode || 'pc_balance' === $searchCode ? $this->primaryCurrency->code : $searchCode;
                 // Log::debug(sprintf('Search code is %s', $searchCode));
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
                 $startBalance = ($startBalances[$account->id][$key] ?? '0');
-                // Log::debug(sprintf('Start balance is %s', $startBalance));
                 $diff         = bcsub($endBalance, $startBalance);
                 $currencies[$searchCode] ??= $this->currencyRepository->findByCode($searchCode);
                 if (0 !== bccomp($diff, '0')) {
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 49433fb8ebc..d10005689bc 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -190,7 +190,6 @@ public function budgetLimit(Budget $budget, BudgetLimit $budgetLimit): JsonRespo
         $data['datasets'][0]['currency_symbol'] = $currency->symbol;
         $data['datasets'][0]['currency_code']   = $currency->code;
         $cache->store($data);
-        // var_dump($data);exit;
 
         return response()->json($data);
     }
diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php
index d3806d846e1..2a2565d5b8f 100644
--- a/app/Http/Controllers/Chart/ExpenseReportController.php
+++ b/app/Http/Controllers/Chart/ExpenseReportController.php
@@ -180,7 +180,7 @@ public function mainChart(Collection $accounts, Collection $expense, Carbon $sta
                 $newSet[$key] = $entry;
             }
         }
-        if (0 === count($newSet)) {
+        if (empty($newSet)) {
             $newSet = $chartData;
         }
         $data         = $this->generator->multiSet($newSet);
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index dc282fbc074..4df5ca80332 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -86,7 +86,6 @@ public function __construct()
 
         // overrule v2 layout back to v1.
         if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
-            // config('view.layout','v1');
             Config::set('view.layout', 'v1');
             View::getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
         }
diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php
index ff3f5e8c83d..efd2a2dc1d9 100644
--- a/app/Http/Controllers/Json/BoxController.php
+++ b/app/Http/Controllers/Json/BoxController.php
@@ -123,7 +123,7 @@ public function balance(CurrencyRepositoryInterface $repository): JsonResponse
             $incomes[$currencyId]  = app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false);
             $expenses[$currencyId] = app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false);
         }
-        if (0 === count($sums)) {
+        if (empty($sums)) {
             $currency                             = $this->primaryCurrency;
             $sums[$this->primaryCurrency->id]     = app('amount')->formatAnything($this->primaryCurrency, '0', false);
             $incomes[$this->primaryCurrency->id]  = app('amount')->formatAnything($this->primaryCurrency, '0', false);
diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.php
index f66864866b4..30133279fe8 100644
--- a/app/Http/Controllers/Json/FrontpageController.php
+++ b/app/Http/Controllers/Json/FrontpageController.php
@@ -84,7 +84,7 @@ public function piggyBanks(PiggyBankRepositoryInterface $repository): JsonRespon
         );
 
         $html = '';
-        if (0 !== count($info)) {
+        if (!empty($info)) {
             try {
                 $convertToPrimary = $this->convertToPrimary;
                 $primary          = $this->primaryCurrency;
diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php
index 2b26e165011..1de9c91173d 100644
--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -291,7 +291,6 @@ public function period(Collection $accounts, Carbon $start, Carbon $end)
         $cache->addProperty('budget-period-report');
         $cache->addProperty($accounts->pluck('id')->toArray());
         if ($cache->has()) {
-            // return $cache->get();
         }
 
         $periods   = Navigation::listOfPeriods($start, $end);
diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php
index 107042d458a..6d1f0e7b4aa 100644
--- a/app/Http/Controllers/Rule/CreateController.php
+++ b/app/Http/Controllers/Rule/CreateController.php
@@ -115,7 +115,6 @@ public function create(Request $request, ?RuleGroup $ruleGroup = null)
             }
             $oldTriggers   = $this->parseFromOperators($operators);
         }
-        // var_dump($oldTriggers);exit;
 
         // restore actions and triggers from old input:
         if (is_array($request->old()) && count($request->old()) > 0) {
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index a0319eb8cd0..a678c879ed3 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -80,7 +80,7 @@ public function handle($request, Closure $next, ...$guards)
      */
     protected function authenticate($request, array $guards)
     {
-        if (0 === count($guards)) {
+        if (empty($guards)) {
             // go for default guard:
             // @noinspection PhpUndefinedMethodInspection
             if ($this->auth->check()) {
@@ -129,7 +129,6 @@ private function validateBlockedUser(?User $user, array $guards): void
             app('log')->warning('User is null, throw exception?');
         }
         if ($user instanceof User) {
-            // app('log')->debug(get_class($user));
             if (1 === (int) $user->blocked) {
                 $message = (string) trans('firefly.block_account_logout');
                 if ('email_changed' === $user->blocked_code) {
diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php
index f7d38232caa..a221f43559e 100644
--- a/app/Http/Middleware/Installer.php
+++ b/app/Http/Middleware/Installer.php
@@ -57,7 +57,6 @@ public function handle($request, Closure $next)
         $url    = $request->url();
         $strpos = stripos($url, '/install');
         if (false !== $strpos) {
-            // Log::debug(sprintf('URL is %s, will NOT run installer middleware', $url));
 
             return $next($request);
         }
@@ -82,7 +81,6 @@ public function handle($request, Closure $next)
      */
     private function hasNoTables(): bool
     {
-        // Log::debug('Now in routine hasNoTables()');
 
         try {
             DB::table('users')->count();
@@ -106,7 +104,6 @@ private function hasNoTables(): bool
             throw new FireflyException(sprintf('Could not access the database: %s', $message), 0, $e);
         }
 
-        // Log::debug('Everything seems OK with the tables.');
 
         return false;
     }
@@ -147,7 +144,6 @@ private function oldDBVersion(): bool
             return true;
         }
 
-        // Log::info(sprintf('Configured DB version (%d) equals expected DB version (%d)', $dbVersion, $configVersion));
 
         return false;
     }
@@ -177,7 +173,6 @@ private function oldVersion(): bool
             return true;
         }
 
-        // Log::info(sprintf('Installed Firefly III version (%s) equals expected Firefly III version (%s)', $dbVersion, $configVersion));
 
         return false;
     }
diff --git a/app/Jobs/WarnAboutBills.php b/app/Jobs/WarnAboutBills.php
index 155454790ea..470ba12dd34 100644
--- a/app/Jobs/WarnAboutBills.php
+++ b/app/Jobs/WarnAboutBills.php
@@ -182,7 +182,7 @@ private function getDates(Bill $bill): array
     private function needsOverdueAlert(array $dates): bool
     {
         $count    = count($dates['pay_dates']) - count($dates['paid_dates']);
-        if (0 === $count || 0 === count($dates['pay_dates'])) {
+        if (0 === $count || empty($dates['pay_dates'])) {
             return false;
         }
         // the earliest date in the list of pay dates must be 48hrs or more ago.
@@ -200,7 +200,7 @@ private function needsOverdueAlert(array $dates): bool
 
     private function sendOverdueAlerts(User $user, array $overdue): void
     {
-        if (count($overdue) > 0) {
+        if (!empty($overdue)) {
             Log::debug(sprintf('Will now send warning about overdue bill for user #%d.', $user->id));
             event(new WarnUserAboutOverdueSubscriptions($user, $overdue));
         }
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 609d7dc3534..936fc65701d 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -171,7 +171,7 @@ protected function transactionTypes(EloquentBuilder $query, array $types): void
         if (!self::isJoined($query, 'transaction_types')) {
             $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
         }
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->whereIn('transaction_types.type', $types);
         }
     }
diff --git a/app/Notifications/Test/OwnerTestNotificationNtfy.php b/app/Notifications/Test/OwnerTestNotificationNtfy.php
index 9f72e8544bd..7f75ba0a3f1 100644
--- a/app/Notifications/Test/OwnerTestNotificationNtfy.php
+++ b/app/Notifications/Test/OwnerTestNotificationNtfy.php
@@ -31,7 +31,6 @@
 use Ntfy\Message;
 use Wijourdil\NtfyNotificationChannel\Channels\NtfyChannel;
 
-// use Illuminate\Notifications\Slack\SlackMessage;
 
 /**
  * Class TestNotification
diff --git a/app/Notifications/Test/OwnerTestNotificationPushover.php b/app/Notifications/Test/OwnerTestNotificationPushover.php
index 0e2c444f013..feeb9880150 100644
--- a/app/Notifications/Test/OwnerTestNotificationPushover.php
+++ b/app/Notifications/Test/OwnerTestNotificationPushover.php
@@ -31,7 +31,6 @@
 use NotificationChannels\Pushover\PushoverChannel;
 use NotificationChannels\Pushover\PushoverMessage;
 
-// use Illuminate\Notifications\Slack\SlackMessage;
 
 /**
  * Class TestNotification
diff --git a/app/Notifications/Test/OwnerTestNotificationSlack.php b/app/Notifications/Test/OwnerTestNotificationSlack.php
index 7a0a6e40dea..2f2afee9cd6 100644
--- a/app/Notifications/Test/OwnerTestNotificationSlack.php
+++ b/app/Notifications/Test/OwnerTestNotificationSlack.php
@@ -29,7 +29,6 @@
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
 
-// use Illuminate\Notifications\Slack\SlackMessage;
 
 /**
  * Class TestNotification
@@ -53,7 +52,6 @@ public function toArray(OwnerNotifiable $notifiable): array
     public function toSlack(OwnerNotifiable $notifiable): SlackMessage
     {
         return new SlackMessage()->content((string) trans('email.admin_test_subject'));
-        // return new SlackMessage()->text((string) trans('email.admin_test_subject'))->to($url);
     }
 
     /**
diff --git a/app/Notifications/Test/UserTestNotificationNtfy.php b/app/Notifications/Test/UserTestNotificationNtfy.php
index babcb459f81..6e9e388e8d4 100644
--- a/app/Notifications/Test/UserTestNotificationNtfy.php
+++ b/app/Notifications/Test/UserTestNotificationNtfy.php
@@ -31,7 +31,6 @@
 use Ntfy\Message;
 use Wijourdil\NtfyNotificationChannel\Channels\NtfyChannel;
 
-// use Illuminate\Notifications\Slack\SlackMessage;
 
 /**
  * Class TestNotification
diff --git a/app/Notifications/Test/UserTestNotificationPushover.php b/app/Notifications/Test/UserTestNotificationPushover.php
index e963b4bca97..7870d9ff86b 100644
--- a/app/Notifications/Test/UserTestNotificationPushover.php
+++ b/app/Notifications/Test/UserTestNotificationPushover.php
@@ -31,7 +31,6 @@
 use NotificationChannels\Pushover\PushoverChannel;
 use NotificationChannels\Pushover\PushoverMessage;
 
-// use Illuminate\Notifications\Slack\SlackMessage;
 
 /**
  * Class TestNotification
diff --git a/app/Notifications/Test/UserTestNotificationSlack.php b/app/Notifications/Test/UserTestNotificationSlack.php
index 59cedc0b4cf..2d8ef659bc7 100644
--- a/app/Notifications/Test/UserTestNotificationSlack.php
+++ b/app/Notifications/Test/UserTestNotificationSlack.php
@@ -29,7 +29,6 @@
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
 
-// use Illuminate\Notifications\Slack\SlackMessage;
 
 /**
  * Class TestNotification
@@ -53,7 +52,6 @@ public function toArray(User $user): array
     public function toSlack(User $user): SlackMessage
     {
         return new SlackMessage()->content((string) trans('email.admin_test_subject'));
-        // return new SlackMessage()->text((string) trans('email.admin_test_subject'))->to($url);
     }
 
     /**
diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php
index 169efb81093..7af549d352a 100644
--- a/app/Policies/UserPolicy.php
+++ b/app/Policies/UserPolicy.php
@@ -34,13 +34,11 @@ class UserPolicy
     public function view(User $user, User $user1): bool
     {
         return true;
-        //        return auth()->check() && $user->id === $account->user_id;
     }
 
     public function viewAccounts(User $user): bool
     {
         return true;
-        //        return auth()->check();
     }
 
     /**
@@ -51,6 +49,5 @@ public function viewAccounts(User $user): bool
     public function viewAny(): bool
     {
         return true;
-        //        return auth()->check();
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 263342b7533..0688c775d18 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -44,7 +44,6 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Schema::defaultStringLength(191);
-        // Passport::$clientUuids = false;
         Response::macro('api', function (array $value) {
             $headers = [
                 'Cache-Control' => 'no-store',
@@ -94,7 +93,6 @@ public function boot(): void
     public function register(): void
     {
         Passport::ignoreRoutes();
-        //        Passport::ignoreMigrations();
         //        Sanctum::ignoreMigrations();
     }
 }
diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index afd301bf228..69816d4d0e5 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -118,7 +118,7 @@ static function (EloquentBuilder $q1) use ($number): void {
             )
         ;
 
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }
@@ -132,7 +132,7 @@ public function findByIbanNull(string $iban, array $types): ?Account
         $iban  = Steam::filterSpaces($iban);
         $query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban');
 
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $query->whereIn('account_types.type', $types);
         }
@@ -145,7 +145,7 @@ public function findByName(string $name, array $types): ?Account
     {
         $query   = $this->user->accounts();
 
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $query->whereIn('account_types.type', $types);
         }
@@ -183,7 +183,7 @@ public function getAccountsById(array $accountIds): Collection
     {
         $query = $this->user->accounts();
 
-        if (0 !== count($accountIds)) {
+        if (!empty($accountIds)) {
             $query->whereIn('accounts.id', $accountIds);
         }
         $query->orderBy('accounts.order', 'ASC');
@@ -203,7 +203,7 @@ public function getActiveAccountsByType(array $types): Collection
                 'attachments',
             ]
         );
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->accountTypeIn($types);
         }
         $query->where('active', true);
@@ -267,7 +267,7 @@ public function getInactiveAccountsByType(array $types): Collection
                 },
             ]
         );
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->accountTypeIn($types);
         }
         $query->where('active', 0);
@@ -480,19 +480,19 @@ public function getAccountsByType(array $types, ?array $sort = []): Collection
     {
         $res   = array_intersect([AccountTypeEnum::ASSET->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value], $types);
         $query = $this->user->accounts();
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->accountTypeIn($types);
         }
 
         // add sort parameters. At this point they're filtered to allowed fields to sort by:
-        if (0 !== count($sort)) {
+        if (!empty($sort)) {
             foreach ($sort as $param) {
                 $query->orderBy($param[0], $param[1]);
             }
         }
 
-        if (0 === count($sort)) {
-            if (0 !== count($res)) {
+        if (empty($sort)) {
+            if (!empty($res)) {
                 $query->orderBy('accounts.order', 'ASC');
             }
             $query->orderBy('accounts.active', 'DESC');
@@ -636,7 +636,7 @@ public function searchAccount(string $query, array $types, int $limit): Collecti
                 $dbQuery->whereLike('name', $search);
             }
         }
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }
@@ -672,7 +672,7 @@ static function (EloquentBuilder $q2) use ($search): void {
                 );
             }
         }
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }
diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index 99c484f4a8e..97fc8fad632 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -307,7 +307,6 @@ public function getPaginator(int $size): LengthAwarePaginator
      */
     public function getPaidDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection
     {
-        // app('log')->debug('Now in getPaidDatesInRange()');
 
         Log::debug(sprintf('Search for linked journals between %s and %s', $start->toW3cString(), $end->toW3cString()));
 
@@ -568,9 +567,7 @@ public function sumPaidInRange(Carbon $start, Carbon $end): array
 
                 // get currency from transaction as well.
                 $return[(int) $transactionCurrency->id]['sum'] = bcadd($return[(int) $transactionCurrency->id]['sum'], Amount::getAmountFromJournalObject($transactionJournal));
-                // $setAmount = bcadd($setAmount, Amount::getAmountFromJournalObject($transactionJournal));
             }
-            // Log::debug(sprintf('Bill #%d ("%s") with %d transaction(s) and sum %s %s', $bill->id, $bill->name, $set->count(), $currency->code, $setAmount));
             // $return[$currency->id]['sum'] = bcadd($return[$currency->id]['sum'], $setAmount);
             // Log::debug(sprintf('Total sum is now %s', $return[$currency->id]['sum']));
         }
@@ -605,16 +602,13 @@ public function sumUnpaidInRange(Carbon $start, Carbon $end): array
 
         /** @var Bill $bill */
         foreach ($bills as $bill) {
-            //            app('log')->debug(sprintf('Processing bill #%d ("%s")', $bill->id, $bill->name));
             $dates    = $this->getPayDatesInRange($bill, $start, $end);
             $count    = $bill->transactionJournals()->after($start)->before($end)->count();
             $total    = $dates->count() - $count;
-            // app('log')->debug(sprintf('Pay dates: %d, count: %d, left: %d', $dates->count(), $count, $total));
             // app('log')->debug('dates', $dates->toArray());
 
             $minField = $convertToPrimary && $bill->transactionCurrency->id !== $primary->id ? 'native_amount_min' : 'amount_min';
             $maxField = $convertToPrimary && $bill->transactionCurrency->id !== $primary->id ? 'native_amount_max' : 'amount_max';
-            // Log::debug(sprintf('min field is %s, max field is %s', $minField, $maxField));
 
             if ($total > 0) {
                 $currency                     = $convertToPrimary && $bill->transactionCurrency->id !== $primary->id ? $primary : $bill->transactionCurrency;
@@ -642,21 +636,17 @@ public function getPayDatesInRange(Bill $bill, Carbon $start, Carbon $end): Coll
     {
         $set          = new Collection();
         $currentStart = clone $start;
-        // app('log')->debug(sprintf('Now at bill "%s" (%s)', $bill->name, $bill->repeat_freq));
         // app('log')->debug(sprintf('First currentstart is %s', $currentStart->format('Y-m-d')));
 
         while ($currentStart <= $end) {
-            // app('log')->debug(sprintf('Currentstart is now %s.', $currentStart->format('Y-m-d')));
             $nextExpectedMatch = $this->nextDateMatch($bill, $currentStart);
             // app('log')->debug(sprintf('Next Date match after %s is %s', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d')));
             if ($nextExpectedMatch > $end) {// If nextExpectedMatch is after end, we continue
                 break;
             }
             $set->push(clone $nextExpectedMatch);
-            // app('log')->debug(sprintf('Now %d dates in set.', $set->count()));
             $nextExpectedMatch->addDay();
 
-            // app('log')->debug(sprintf('Currentstart (%s) has become %s.', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d')));
 
             $currentStart      = clone $nextExpectedMatch;
         }
diff --git a/app/Repositories/ExchangeRate/ExchangeRateRepository.php b/app/Repositories/ExchangeRate/ExchangeRateRepository.php
index 1fecb036fd4..c953320d4dc 100644
--- a/app/Repositories/ExchangeRate/ExchangeRateRepository.php
+++ b/app/Repositories/ExchangeRate/ExchangeRateRepository.php
@@ -52,7 +52,6 @@ public function getAll(): Collection
     #[Override]
     public function getRates(TransactionCurrency $from, TransactionCurrency $to): Collection
     {
-        // orderBy('date', 'DESC')->toRawSql();
         return
             $this->userGroup->currencyExchangeRates()
                 ->where(function (Builder $q1) use ($from, $to): void {
diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
index 658ca6e1c83..2d6eab2e55d 100644
--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
@@ -332,7 +332,6 @@ public function updateNote(PiggyBank $piggyBank, string $note): void
     public function setOrder(PiggyBank $piggyBank, int $newOrder): bool
     {
         $oldOrder         = $piggyBank->order;
-        // Log::debug(sprintf('Will move piggy bank #%d ("%s") from %d to %d', $piggyBank->id, $piggyBank->name, $oldOrder, $newOrder));
         if ($newOrder > $oldOrder) {
             PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
                 ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php
index e12a543e388..b7d302c3cc6 100644
--- a/app/Repositories/Recurring/RecurringRepository.php
+++ b/app/Repositories/Recurring/RecurringRepository.php
@@ -322,7 +322,7 @@ public function getTransactions(Recurrence $recurrence): Collection
         foreach ($journalMeta as $journalId) {
             $search[] = (int) $journalId;
         }
-        if (0 === count($search)) {
+        if (empty($search)) {
             return new Collection();
         }
 
diff --git a/app/Repositories/UserGroups/Account/AccountRepository.php b/app/Repositories/UserGroups/Account/AccountRepository.php
index 418f16ef8b6..11c70f1d5f2 100644
--- a/app/Repositories/UserGroups/Account/AccountRepository.php
+++ b/app/Repositories/UserGroups/Account/AccountRepository.php
@@ -55,7 +55,7 @@ class AccountRepository implements AccountRepositoryInterface
     public function countAccounts(array $types): int
     {
         $query = $this->userGroup->accounts();
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->accountTypeIn($types);
         }
 
@@ -77,7 +77,7 @@ static function (EloquentBuilder $q1) use ($number): void {
             )
         ;
 
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }
@@ -91,7 +91,7 @@ public function findByIbanNull(string $iban, array $types): ?Account
         $iban  = Steam::filterSpaces($iban);
         $query = $this->userGroup->accounts()->where('iban', '!=', '')->whereNotNull('iban');
 
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $query->whereIn('account_types.type', $types);
         }
@@ -104,7 +104,7 @@ public function findByName(string $name, array $types): ?Account
     {
         $query   = $this->userGroup->accounts();
 
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $query->whereIn('account_types.type', $types);
         }
@@ -189,7 +189,7 @@ public function getAccountsById(array $accountIds): Collection
     {
         $query = $this->userGroup->accounts();
 
-        if (0 !== count($accountIds)) {
+        if (!empty($accountIds)) {
             $query->whereIn('accounts.id', $accountIds);
         }
         $query->orderBy('accounts.order', 'ASC');
@@ -203,20 +203,20 @@ public function getAccountsById(array $accountIds): Collection
     public function getAccountsInOrder(array $types, array $sort, int $startRow, int $endRow): Collection
     {
         $query = $this->userGroup->accounts();
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->accountTypeIn($types);
         }
         $query->skip($startRow);
         $query->take($endRow - $startRow);
 
         // add sort parameters. At this point they're filtered to allowed fields to sort by:
-        if (0 !== count($sort)) {
+        if (!empty($sort)) {
             foreach ($sort as $label => $direction) {
                 $query->orderBy(sprintf('accounts.%s', $label), $direction);
             }
         }
 
-        if (0 === count($sort)) {
+        if (empty($sort)) {
             $query->orderBy('accounts.order', 'ASC');
             $query->orderBy('accounts.active', 'DESC');
             $query->orderBy('accounts.name', 'ASC');
@@ -228,7 +228,7 @@ public function getAccountsInOrder(array $types, array $sort, int $startRow, int
     public function getActiveAccountsByType(array $types): Collection
     {
         $query = $this->userGroup->accounts();
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->accountTypeIn($types);
         }
         $query->where('active', true);
@@ -253,7 +253,7 @@ public function getLastActivity(Collection $accounts): array
     public function getMetaValues(Collection $accounts, array $fields): Collection
     {
         $query = AccountMeta::whereIn('account_id', $accounts->pluck('id')->toArray());
-        if (count($fields) > 0) {
+        if (!empty($fields)) {
             $query->whereIn('name', $fields);
         }
 
@@ -326,7 +326,7 @@ public function getAccountsByType(array $types, ?array $sort = [], ?array $filte
         $sortable        = ['name', 'active']; // TODO yes this is a duplicate array.
         $res             = array_intersect([AccountTypeEnum::ASSET->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value], $types);
         $query           = $this->userGroup->accounts();
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $query->accountTypeIn($types);
         }
 
@@ -348,7 +348,7 @@ public function getAccountsByType(array $types, ?array $sort = [], ?array $filte
 
         // add sort parameters. At this point they're filtered to allowed fields to sort by:
         $hasActiveColumn = array_key_exists('active', $sort);
-        if (count($sort) > 0) {
+        if (!empty($sort)) {
             if (false === $hasActiveColumn) {
                 $query->orderBy('accounts.active', 'DESC');
             }
@@ -359,8 +359,8 @@ public function getAccountsByType(array $types, ?array $sort = [], ?array $filte
             }
         }
 
-        if (0 === count($sort)) {
-            if (0 !== count($res)) {
+        if (empty($sort)) {
+            if (!empty($res)) {
                 $query->orderBy('accounts.active', 'DESC');
             }
             $query->orderBy('accounts.order', 'ASC');
@@ -404,7 +404,7 @@ public function searchAccount(string $query, array $types, int $page, int $limit
             });
         }
 
-        if (0 !== count($types)) {
+        if (!empty($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }
diff --git a/app/Repositories/UserGroups/Bill/BillRepository.php b/app/Repositories/UserGroups/Bill/BillRepository.php
index defdaaba0d8..5b4f7815957 100644
--- a/app/Repositories/UserGroups/Bill/BillRepository.php
+++ b/app/Repositories/UserGroups/Bill/BillRepository.php
@@ -186,21 +186,17 @@ public function getPayDatesInRange(Bill $bill, Carbon $start, Carbon $end): Coll
     {
         $set          = new Collection();
         $currentStart = clone $start;
-        // app('log')->debug(sprintf('Now at bill "%s" (%s)', $bill->name, $bill->repeat_freq));
         // app('log')->debug(sprintf('First currentstart is %s', $currentStart->format('Y-m-d')));
 
         while ($currentStart <= $end) {
-            // app('log')->debug(sprintf('Currentstart is now %s.', $currentStart->format('Y-m-d')));
             $nextExpectedMatch = $this->nextDateMatch($bill, $currentStart);
             // app('log')->debug(sprintf('Next Date match after %s is %s', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d')));
             if ($nextExpectedMatch > $end) {// If nextExpectedMatch is after end, we continue
                 break;
             }
             $set->push(clone $nextExpectedMatch);
-            // app('log')->debug(sprintf('Now %d dates in set.', $set->count()));
             $nextExpectedMatch->addDay();
 
-            // app('log')->debug(sprintf('Currentstart (%s) has become %s.', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d')));
 
             $currentStart      = clone $nextExpectedMatch;
         }
diff --git a/app/Repositories/UserGroups/Category/CategoryRepository.php b/app/Repositories/UserGroups/Category/CategoryRepository.php
index 2b93a540cf7..ccb0fd198f3 100644
--- a/app/Repositories/UserGroups/Category/CategoryRepository.php
+++ b/app/Repositories/UserGroups/Category/CategoryRepository.php
@@ -40,7 +40,7 @@ class CategoryRepository implements CategoryRepositoryInterface
     public function searchCategory(array $query, int $limit): Collection
     {
         $search = $this->userGroup->categories();
-        if (count($query) > 0) {
+        if (!empty($query)) {
             // split query on spaces just in case:
             $search->where(function (EloquentBuilder $q) use ($query): void {
                 foreach ($query as $line) {
diff --git a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php
index 3dc1d6a7972..a4e7a8c6e05 100644
--- a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php
+++ b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php
@@ -56,7 +56,6 @@ public function getAll(): Collection
     #[Override]
     public function getRates(TransactionCurrency $from, TransactionCurrency $to): Collection
     {
-        // orderBy('date', 'DESC')->toRawSql();
         return
             $this->userGroup->currencyExchangeRates()
                 ->where(function (Builder $q1) use ($from, $to): void {
diff --git a/app/Repositories/UserGroups/Journal/JournalRepository.php b/app/Repositories/UserGroups/Journal/JournalRepository.php
index 8926573acdc..e602c0f9ea2 100644
--- a/app/Repositories/UserGroups/Journal/JournalRepository.php
+++ b/app/Repositories/UserGroups/Journal/JournalRepository.php
@@ -42,7 +42,7 @@ public function searchJournalDescriptions(array $query, int $limit): Collection
         $search = $this->userGroup->transactionJournals()
             ->orderBy('date', 'DESC')
         ;
-        if (count($query) > 0) {
+        if (!empty($query)) {
             // split query on spaces just in case:
             $search->where(function (EloquentBuilder $q) use ($query): void {
                 foreach ($query as $line) {
diff --git a/app/Repositories/UserGroups/Tag/TagRepository.php b/app/Repositories/UserGroups/Tag/TagRepository.php
index 49f9c2e044a..2d276710a24 100644
--- a/app/Repositories/UserGroups/Tag/TagRepository.php
+++ b/app/Repositories/UserGroups/Tag/TagRepository.php
@@ -40,7 +40,7 @@ class TagRepository implements TagRepositoryInterface
     public function searchTag(array $query, int $limit): Collection
     {
         $search = $this->userGroup->tags();
-        if (count($query) > 0) {
+        if (!empty($query)) {
             // split query on spaces just in case:
             $search->where(function (EloquentBuilder $q) use ($query): void {
                 foreach ($query as $line) {
diff --git a/app/Rules/IsFilterValueIn.php b/app/Rules/IsFilterValueIn.php
index e167bdb79c0..a9a73c52105 100644
--- a/app/Rules/IsFilterValueIn.php
+++ b/app/Rules/IsFilterValueIn.php
@@ -50,6 +50,5 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
         if (!in_array($value, $this->values, true)) {
             $fail('validation.filter_must_be_in')->translate(['filter' => $this->key, 'values' => implode(', ', $this->values)]);
         }
-        // $fail('validation.filter_not_string')->translate(['filter' => $this->key]);
     }
 }
diff --git a/app/Services/Internal/Support/CreditRecalculateService.php b/app/Services/Internal/Support/CreditRecalculateService.php
index da77efb15aa..01d5723cba3 100644
--- a/app/Services/Internal/Support/CreditRecalculateService.php
+++ b/app/Services/Internal/Support/CreditRecalculateService.php
@@ -172,7 +172,6 @@ private function processWorkAccount(Account $account): void
         }
         $startOfDebt    = $this->repository->getOpeningBalanceAmount($account, false) ?? '0';
         $leftOfDebt     = app('steam')->positive($startOfDebt);
-        //        Log::debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', app('steam')->bcround($startOfDebt, 2), app('steam')->bcround($leftOfDebt, 2)));
 
         /** @var AccountMetaFactory $factory */
         $factory        = app(AccountMetaFactory::class);
@@ -180,7 +179,6 @@ private function processWorkAccount(Account $account): void
         // amount is positive or negative, doesn't matter.
         $factory->crud($account, 'start_of_debt', $startOfDebt);
 
-        //        Log::debug(sprintf('Debt direction is "%s"', $direction));
 
         // now loop all transactions (except opening balance and credit thing)
         $transactions   = $account->transactions()
@@ -189,11 +187,9 @@ private function processWorkAccount(Account $account): void
             ->get(['transactions.*'])
         ;
         $total          = $transactions->count();
-        //        Log::debug(sprintf('Found %d transaction(s) to process.', $total));
 
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
-            //            Log::debug(sprintf('[%d/%d] Processing transaction.', $index + 1, $total));
             $leftOfDebt = $this->processTransaction($account, $direction, $transaction, $leftOfDebt);
         }
         $factory->crud($account, 'current_debt', $leftOfDebt);
@@ -229,7 +225,6 @@ private function validateOpeningBalance(Account $account, TransactionJournal $op
 
             return;
         }
-        // Log::debug('Opening balance is valid');
     }
 
     /**
@@ -254,19 +249,15 @@ private function processTransaction(Account $account, string $direction, Transac
         $foreignCurrency = $transaction->foreignCurrency;
         $accountCurrency = $this->repository->getAccountCurrency($account);
         $type            = $journal->transactionType->type;
-        //        Log::debug(sprintf('Left of debt is: %s', app('steam')->bcround($leftOfDebt, 2)));
 
         if ('' === $direction) {
-            //            Log::warning('Direction is empty, so do nothing.');
 
             return $leftOfDebt;
         }
         if (TransactionTypeEnum::LIABILITY_CREDIT->value === $type || TransactionTypeEnum::OPENING_BALANCE->value === $type) {
-            // Log::warning(sprintf('Transaction type is "%s", so do nothing.', $type));
 
             return $leftOfDebt;
         }
-        //        Log::debug(sprintf('Liability direction is "%s"', $direction));
 
         // amount to use depends on the currency:
         $usedAmount      = $this->getAmountToUse($transaction, $accountCurrency, $foreignCurrency);
@@ -278,52 +269,44 @@ private function processTransaction(Account $account, string $direction, Transac
             $usedAmount = app('steam')->positive($usedAmount);
 
             return bcadd($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case 1 (withdrawal into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         if ($isSameAccount && $isCredit && $this->isWithdrawalOut($usedAmount, $type)) { // case 2
             $usedAmount = app('steam')->positive($usedAmount);
 
             return bcsub($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case 2 (withdrawal away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         if ($isSameAccount && $isCredit && $this->isDepositOut($usedAmount, $type)) { // case 3
             $usedAmount = app('steam')->positive($usedAmount);
 
             return bcsub($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case 3 (deposit away from liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         if ($isSameAccount && $isCredit && $this->isDepositIn($usedAmount, $type)) { // case 4
             $usedAmount = app('steam')->positive($usedAmount);
 
             return bcadd($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case 4 (deposit into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isCredit && $this->isTransferIn($usedAmount, $type)) { // case 5
             $usedAmount = app('steam')->positive($usedAmount);
 
             return bcadd($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case 5 (transfer into credit liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isDebit && $this->isWithdrawalIn($usedAmount, $type)) { // case 6
             $usedAmount = app('steam')->positive($usedAmount);
 
             return bcsub($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case 6 (withdrawal into debit liability): %s - %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isDebit && $this->isDepositOut($usedAmount, $type)) { // case 7
             $usedAmount = app('steam')->positive($usedAmount);
 
             return bcadd($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case 7 (deposit away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
         if ($isSameAccount && $isDebit && $this->isWithdrawalOut($usedAmount, $type)) { // case 8
             $usedAmount = app('steam')->positive($usedAmount);
 
             return bcadd($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case 8 (withdrawal away from liability): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         if ($isSameAccount && $isDebit && $this->isTransferIn($usedAmount, $type)) { // case 9
@@ -346,7 +329,6 @@ private function processTransaction(Account $account, string $direction, Transac
             $usedAmount = app('steam')->negative($usedAmount);
 
             return bcadd($leftOfDebt, (string) $usedAmount);
-            //            Log::debug(sprintf('Case X (all other cases): %s + %s = %s', app('steam')->bcround($leftOfDebt, 2), app('steam')->bcround($usedAmount, 2), app('steam')->bcround($result, 2)));
         }
 
         Log::warning(sprintf('[-1] Catch-all, should not happen. Left of debt = %s', app('steam')->bcround($leftOfDebt, 2)));
@@ -357,10 +339,8 @@ private function processTransaction(Account $account, string $direction, Transac
     private function getAmountToUse(Transaction $transaction, TransactionCurrency $accountCurrency, ?TransactionCurrency $foreignCurrency): string
     {
         $usedAmount = $transaction->amount;
-        //        Log::debug(sprintf('Amount of transaction is %s', app('steam')->bcround($usedAmount, 2)));
         if ($foreignCurrency instanceof TransactionCurrency && $foreignCurrency->id === $accountCurrency->id) {
             $usedAmount = $transaction->foreign_amount;
-            //            Log::debug(sprintf('Overruled by foreign amount. Amount of transaction is now %s', app('steam')->bcround($usedAmount, 2)));
         }
 
         return $usedAmount;
diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php
index d0de5db9df7..33a79999b4a 100644
--- a/app/Services/Internal/Support/JournalServiceTrait.php
+++ b/app/Services/Internal/Support/JournalServiceTrait.php
@@ -127,7 +127,7 @@ private function findAccountById(array $data, array $types): ?Account
 
                 return $search;
             }
-            if (null !== $search && 0 === count($types)) {
+            if (null !== $search && empty($types)) {
                 Log::debug(
                     sprintf('Found "account_id" object: #%d, "%s" of type %s (2)', $search->id, $search->name, $search->accountType->type)
                 );
@@ -288,7 +288,6 @@ private function createAccount(?Account $account, array $data, string $preferred
             }
 
 
-            // $data['name'] = $data['name'] ?? '(no name)';
 
             $account   = $this->accountRepository->store(
                 [
diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php
index 6ac399f6e5d..be812578ee0 100644
--- a/app/Services/Internal/Support/RecurringTransactionTrait.php
+++ b/app/Services/Internal/Support/RecurringTransactionTrait.php
@@ -305,7 +305,7 @@ protected function updatePiggyBank(RecurrenceTransaction $transaction, int $pigg
 
     protected function updateTags(RecurrenceTransaction $transaction, array $tags): void
     {
-        if (0 !== count($tags)) {
+        if (!empty($tags)) {
             /** @var null|RecurrenceMeta $entry */
             $entry        = $transaction->recurrenceTransactionMeta()->where('name', 'tags')->first();
             if (null === $entry) {
@@ -314,7 +314,7 @@ protected function updateTags(RecurrenceTransaction $transaction, array $tags):
             $entry->value = json_encode($tags);
             $entry->save();
         }
-        if (0 === count($tags)) {
+        if (empty($tags)) {
             // delete if present
             $transaction->recurrenceTransactionMeta()->where('name', 'tags')->delete();
         }
diff --git a/app/Services/Internal/Update/GroupUpdateService.php b/app/Services/Internal/Update/GroupUpdateService.php
index 384f3049384..e656ec243d5 100644
--- a/app/Services/Internal/Update/GroupUpdateService.php
+++ b/app/Services/Internal/Update/GroupUpdateService.php
@@ -68,7 +68,7 @@ public function update(TransactionGroup $transactionGroup, array $data): Transac
             );
         }
 
-        if (0 === count($transactions)) {
+        if (empty($transactions)) {
             Log::debug('No transactions submitted, do nothing.');
 
             return $transactionGroup;
@@ -94,7 +94,7 @@ public function update(TransactionGroup $transactionGroup, array $data): Transac
         $updated      = $this->updateTransactions($transactionGroup, $transactions);
         Log::debug('Array of updated IDs: ', $updated);
 
-        if (0 === count($updated)) {
+        if (empty($updated)) {
             Log::error('There were no transactions updated or created. Will not delete anything.');
             $transactionGroup->touch();
             $transactionGroup->refresh();
@@ -105,7 +105,7 @@ public function update(TransactionGroup $transactionGroup, array $data): Transac
 
         $result       = array_diff($existing, $updated);
         Log::debug('Result of DIFF: ', $result);
-        if (count($result) > 0) {
+        if (!empty($result)) {
             /** @var string $deletedId */
             foreach ($result as $deletedId) {
                 /** @var TransactionJournal $journal */
@@ -133,7 +133,7 @@ private function updateTransactionJournal(
         array              $data
     ): void {
         Log::debug(sprintf('Now in %s', __METHOD__));
-        if (0 === count($data)) {
+        if (empty($data)) {
             return;
         }
         if (1 === count($data) && array_key_exists('transaction_journal_id', $data)) {
diff --git a/app/Services/Internal/Update/RecurrenceUpdateService.php b/app/Services/Internal/Update/RecurrenceUpdateService.php
index 7cad86a146f..f9a54044227 100644
--- a/app/Services/Internal/Update/RecurrenceUpdateService.php
+++ b/app/Services/Internal/Update/RecurrenceUpdateService.php
@@ -129,7 +129,7 @@ private function setNoteText(Recurrence $recurrence, string $text): void
     private function updateRepetitions(Recurrence $recurrence, array $repetitions): void
     {
         $originalCount = $recurrence->recurrenceRepetitions()->count();
-        if (0 === count($repetitions)) {
+        if (empty($repetitions)) {
             // won't drop repetition, rather avoid.
             return;
         }
@@ -201,7 +201,7 @@ private function updateTransactions(Recurrence $recurrence, array $transactions)
         app('log')->debug('Now in updateTransactions()');
         $originalCount        = $recurrence->recurrenceTransactions()->count();
         app('log')->debug(sprintf('Original count is %d', $originalCount));
-        if (0 === count($transactions)) {
+        if (empty($transactions)) {
             // won't drop transactions, rather avoid.
             app('log')->warning('No transactions to update, too scared to continue!');
 
@@ -233,7 +233,7 @@ private function updateTransactions(Recurrence $recurrence, array $transactions)
             unset($first);
         }
         // if they are both empty, we can safely loop all combinations and update them.
-        if (0 === count($originalTransactions) && 0 === count($transactions)) {
+        if (empty($originalTransactions) && empty($transactions)) {
             foreach ($combinations as $combination) {
                 $this->updateCombination($recurrence, $combination);
             }
diff --git a/app/Support/Amount.php b/app/Support/Amount.php
index c0c40ac390d..63941e5bff3 100644
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -108,7 +108,6 @@ public function getAmountFromJournal(array $journal): string
         // fallback, the transaction has a foreign amount in $currency.
         if ($convertToPrimary && null !== $journal['foreign_amount'] && $currency->id === (int)$journal['foreign_currency_id']) {
             $amount = $journal['foreign_amount'];
-            // Log::debug(sprintf('Overruled, amount is now %s', $amount));
         }
 
         return (string)$amount;
diff --git a/app/Support/Export/ExportDataGenerator.php b/app/Support/Export/ExportDataGenerator.php
index ad0f0b4b712..ef024a218b0 100644
--- a/app/Support/Export/ExportDataGenerator.php
+++ b/app/Support/Export/ExportDataGenerator.php
@@ -835,7 +835,7 @@ public function setAccounts(Collection $accounts): void
 
     private function mergeTags(array $tags): string
     {
-        if (0 === count($tags)) {
+        if (empty($tags)) {
             return '';
         }
         $smol = [];
diff --git a/app/Support/Http/Api/ExchangeRateConverter.php b/app/Support/Http/Api/ExchangeRateConverter.php
index 1ff60dbaaa9..dac91fb991c 100644
--- a/app/Support/Http/Api/ExchangeRateConverter.php
+++ b/app/Support/Http/Api/ExchangeRateConverter.php
@@ -39,7 +39,6 @@
  */
 class ExchangeRateConverter
 {
-    // use ConvertsExchangeRates;
     private bool  $ignoreSettings = false;
     private array $prepared       = [];
     private int   $queryCount     = 0;
@@ -79,12 +78,10 @@ public function enabled(): bool
     public function getCurrencyRate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): string
     {
         if (false === $this->enabled()) {
-            // Log::debug('ExchangeRateConverter: disabled, return "1".');
 
             return '1';
         }
         if ($from->id === $to->id) {
-            //            Log::debug('ExchangeRateConverter: From and to are the same, return "1".');
 
             return '1';
         }
@@ -232,24 +229,20 @@ private function getEuroRate(TransactionCurrency $currency, Carbon $date): strin
         $rate   = $this->getFromDB($currency->id, $euroId, $date->format('Y-m-d'));
 
         if (null !== $rate) {
-            //            app('log')->debug(sprintf('Rate for %s to EUR is %s.', $currency->code, $rate));
             return $rate;
         }
         $rate   = $this->getFromDB($euroId, $currency->id, $date->format('Y-m-d'));
         if (null !== $rate) {
             return bcdiv('1', $rate);
-            //            app('log')->debug(sprintf('Inverted rate for %s to EUR is %s.', $currency->code, $rate));
             // return $rate;
         }
         // grab backup values from config file:
         $backup = config(sprintf('cer.rates.%s', $currency->code));
         if (null !== $backup) {
             return bcdiv('1', (string) $backup);
-            // app('log')->debug(sprintf('Backup rate for %s to EUR is %s.', $currency->code, $backup));
             // return $backup;
         }
 
-        //        app('log')->debug(sprintf('No rate for %s to EUR.', $currency->code));
         return '0';
     }
 
diff --git a/app/Support/JsonApi/Enrichments/AccountEnrichment.php b/app/Support/JsonApi/Enrichments/AccountEnrichment.php
index c1a162d8fc5..8112a402edd 100644
--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php
@@ -290,7 +290,6 @@ private function appendCollectedData(): void
 
             // get the current balance:
             $date                    = $this->getDate();
-            // $finalBalance            = Steam::finalAccountBalance($item, $date, $this->primaryCurrency, $this->convertToPrimary);
             $finalBalance            = $this->balances[$id];
             Log::debug(sprintf('Call finalAccountBalance(%s) with date/time "%s"', var_export($this->convertToPrimary, true), $date->toIso8601String()), $finalBalance);
 
diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
index 62a0ecb11df..c2d61e76610 100644
--- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
@@ -29,7 +29,6 @@ class PiggyBankEnrichment implements EnrichmentInterface
     private array               $currencyIds   = [];
     private array               $currencies    = [];
     private array               $accountIds    = [];
-    // private array               $accountCurrencies = [];
     private array               $notes         = [];
     private array               $mappedObjects = [];
     private TransactionCurrency $primaryCurrency;
@@ -121,7 +120,6 @@ private function collectIds(): void
             if (!array_key_exists($currencyId, $this->currencies)) {
                 $this->currencies[$currencyId] = TransactionCurrency::find($currencyId);
             }
-            // $this->accountCurrencies[$accountId] = $this->currencies[$currencyId];
         }
 
         // get account info.
diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php
index 76ea5318f4e..0abb6566fdd 100644
--- a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php
@@ -28,12 +28,10 @@ class PiggyBankEventEnrichment implements EnrichmentInterface
     private array      $piggyBankIds      = [];
     private array      $accountCurrencies = [];
     private array      $currencies        = [];
-    // private bool       $convertToPrimary  = false;
     // private TransactionCurrency $primaryCurrency;
 
     public function __construct()
     {
-        // $this->convertToPrimary = Amount::convertToPrimary();
         // $this->primaryCurrency  = Amount::getPrimaryCurrency();
     }
 
diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
index 989e9ea9247..81ff6a9cf55 100644
--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
@@ -343,7 +343,6 @@ private function processTransactions(array $transactions): array
             $transaction['primary_currency_symbol']         = $this->primaryCurrency->symbol;
             $transaction['primary_currency_decimal_places'] = $this->primaryCurrency->decimal_places;
 
-            // $transaction['foreign_currency_id'] = null;
             $transaction['foreign_currency_name']           = null;
             $transaction['foreign_currency_code']           = null;
             $transaction['foreign_currency_symbol']         = null;
@@ -480,7 +479,7 @@ private function collectTransactionMetaData(): void
 
     private function collectBillInfo(array $billIds): void
     {
-        if (0 === count($billIds)) {
+        if (empty($billIds)) {
             return;
         }
         $ids    = Arr::pluck($billIds, 'bill_id');
@@ -498,7 +497,7 @@ private function collectBillInfo(array $billIds): void
 
     private function collectPiggyBankInfo(array $piggyBankIds): void
     {
-        if (0 === count($piggyBankIds)) {
+        if (empty($piggyBankIds)) {
             return;
         }
         $ids        = Arr::pluck($piggyBankIds, 'piggy_bank_id');
@@ -516,7 +515,7 @@ private function collectPiggyBankInfo(array $piggyBankIds): void
 
     private function collectCategoryIdInfo(array $categoryIds): void
     {
-        if (0 === count($categoryIds)) {
+        if (empty($categoryIds)) {
             return;
         }
         $ids        = Arr::pluck($categoryIds, 'category_id');
@@ -537,7 +536,7 @@ private function collectCategoryIdInfo(array $categoryIds): void
      */
     private function collectCategoryNameInfo(array $categoryNames): void
     {
-        if (0 === count($categoryNames)) {
+        if (empty($categoryNames)) {
             return;
         }
         $factory = app(CategoryFactory::class);
@@ -555,7 +554,7 @@ private function collectCategoryNameInfo(array $categoryNames): void
 
     private function collectBudgetInfo(array $budgetIds): void
     {
-        if (0 === count($budgetIds)) {
+        if (empty($budgetIds)) {
             return;
         }
         $ids        = Arr::pluck($budgetIds, 'budget_id');
diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
index 88307e028d8..ea40e357a0d 100644
--- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
@@ -345,7 +345,6 @@ protected function lastPaidDate(Bill $subscription, Collection $dates, Carbon $d
 
     private function getLastPaidDate(array $paidData): ?Carbon
     {
-        // Log::debug('getLastPaidDate()');
         $return = null;
         foreach ($paidData as $entry) {
             if (null !== $return) {
diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index d88b01ba38b..bc9e5f7052d 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -162,7 +162,6 @@ public function blockPeriods(Carbon $start, Carbon $end, string $range): array
     public function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon
     {
         $date         = clone $theDate;
-        // Log::debug(sprintf('Now in startOfPeriod("%s", "%s")', $date->toIso8601String(), $repeatFreq));
         $functionMap  = [
             '1D'        => 'startOfDay',
             'daily'     => 'startOfDay',
@@ -187,7 +186,6 @@ public function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon
 
         if (array_key_exists($repeatFreq, $functionMap)) {
             $function = $functionMap[$repeatFreq];
-            //            Log::debug(sprintf('Function is ->%s()', $function));
             if (array_key_exists($function, $parameterMap)) {
                 //                Log::debug(sprintf('Parameter map, function becomes ->%s(%s)', $function, implode(', ', $parameterMap[$function])));
                 $date->{$function}($parameterMap[$function][0]); // @phpstan-ignore-line
@@ -204,7 +202,6 @@ public function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon
         if ('half-year' === $repeatFreq || '6M' === $repeatFreq) {
             $skipTo = $date->month > 7 ? 6 : 0;
             $date->startOfYear()->addMonths($skipTo);
-            //            Log::debug(sprintf('Custom call for "%s": addMonths(%d)', $repeatFreq, $skipTo));
             //            Log::debug(sprintf('Result is "%s"', $date->toIso8601String()));
 
             return $date;
@@ -221,13 +218,11 @@ public function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon
             default   => null,
         };
         if (null !== $result) {
-            //            Log::debug(sprintf('Result is "%s"', $date->toIso8601String()));
 
             return $result;
         }
 
         if ('custom' === $repeatFreq) {
-            //            Log::debug(sprintf('Custom, result is "%s"', $date->toIso8601String()));
 
             return $date; // the date is already at the start.
         }
@@ -239,7 +234,6 @@ public function startOfPeriod(Carbon $theDate, string $repeatFreq): Carbon
     public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon
     {
         $currentEnd  = clone $end;
-        // Log::debug(sprintf('Now in endOfPeriod("%s", "%s").', $currentEnd->toIso8601String(), $repeatFreq));
 
         $functionMap = [
             '1D'        => 'endOfDay',
@@ -328,7 +322,6 @@ public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon
         if (in_array($repeatFreq, $subDay, true)) {
             $currentEnd->subDay();
         }
-        //        Log::debug(sprintf('Final result: %s', $currentEnd->toIso8601String()));
 
         return $currentEnd;
     }
@@ -494,14 +487,11 @@ public function preferredCarbonFormat(Carbon $start, Carbon $end): string
     {
         $format = 'Y-m-d';
         $diff   = $start->diffInMonths($end, true);
-        // Log::debug(sprintf('preferredCarbonFormat(%s, %s) = %f', $start->format('Y-m-d'), $end->format('Y-m-d'), $diff));
         if ($diff >= 1.001 && $diff < 12.001) {
-            //            Log::debug(sprintf('Return Y-m because %s', $diff));
             $format = 'Y-m';
         }
 
         if ($diff >= 12.001) {
-            //            Log::debug(sprintf('Return Y because %s', $diff));
             return 'Y';
         }
 
diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php
index 41dbe8f9dd2..242c581c9ea 100644
--- a/app/Support/Preferences.php
+++ b/app/Support/Preferences.php
@@ -91,7 +91,6 @@ public function getForUser(User $user, string $name, null|array|bool|int|string
         }
 
         if (null !== $preference) {
-            // Log::debug(sprintf('Found preference #%d for user #%d: %s', $preference->id, $user->id, $name));
 
             return $preference;
         }
@@ -220,7 +219,6 @@ public function getEncrypted(string $name, mixed $default = null): ?Preference
             return null;
         }
         if ('' === $result->data) {
-            // Log::warning(sprintf('Empty encrypted preference found: "%s"', $name));
 
             return $result;
         }
@@ -232,7 +230,6 @@ public function getEncrypted(string $name, mixed $default = null): ?Preference
                 Log::debug('Set data to NULL');
                 $result->data = null;
             }
-            // Log::error(sprintf('Could not decrypt preference "%s": %s', $name, $e->getMessage()));
 
             return $result;
         }
@@ -244,7 +241,6 @@ public function getEncryptedForUser(User $user, string $name, null|array|bool|in
     {
         $result = $this->getForUser($user, $name, $default);
         if ('' === $result->data) {
-            // Log::warning(sprintf('Empty encrypted preference found: "%s"', $name));
 
             return $result;
         }
@@ -256,7 +252,6 @@ public function getEncryptedForUser(User $user, string $name, null|array|bool|in
                 Log::debug('Set data to NULL');
                 $result->data = null;
             }
-            // Log::error(sprintf('Could not decrypt preference "%s": %s', $name, $e->getMessage()));
 
             return $result;
         }
@@ -287,7 +282,6 @@ public function lastActivity(): string
         $instance     = PreferencesSingleton::getInstance();
         $pref         = $instance->getPreference('last_activity');
         if (null !== $pref) {
-            // Log::debug(sprintf('Found last activity in singleton: %s', $pref));
             return $pref;
         }
         $lastActivity = microtime();
diff --git a/app/Support/Report/Summarizer/TransactionSummarizer.php b/app/Support/Report/Summarizer/TransactionSummarizer.php
index a1ab2abf07d..2a2e8bd8f0f 100644
--- a/app/Support/Report/Summarizer/TransactionSummarizer.php
+++ b/app/Support/Report/Summarizer/TransactionSummarizer.php
@@ -76,7 +76,6 @@ public function groupByCurrencyId(array $journals, string $method = 'negative',
                 $usePrimary = $this->default->id !== (int) $journal['currency_id'];
                 $useForeign = $this->default->id === (int) $journal['foreign_currency_id'];
                 if ($usePrimary) {
-                    //                    Log::debug(sprintf('Journal #%d switches to primary currency amount (original is %s)', $journal['transaction_journal_id'], $journal['currency_code']));
                     $field                 = 'pc_amount';
                     $currencyId            = $this->default->id;
                     $currencyName          = $this->default->name;
@@ -85,7 +84,6 @@ public function groupByCurrencyId(array $journals, string $method = 'negative',
                     $currencyDecimalPlaces = $this->default->decimal_places;
                 }
                 if ($useForeign) {
-                    //                    Log::debug(sprintf('Journal #%d switches to foreign amount (foreign is %s)', $journal['transaction_journal_id'], $journal['foreign_currency_code']));
                     $field                 = 'foreign_amount';
                     $currencyId            = (int) $journal['foreign_currency_id'];
                     $currencyName          = $journal['foreign_currency_name'];
@@ -145,7 +143,6 @@ public function groupByCurrencyId(array $journals, string $method = 'negative',
                 }
             }
 
-            // $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->{$method}($amount));
             // Log::debug(sprintf('Journal #%d adds amount %s %s', $journal['transaction_journal_id'], $currencyCode, $amount));
         }
         Log::debug('End of sumExpenses.', $array);
diff --git a/app/Support/Repositories/Recurring/FiltersWeekends.php b/app/Support/Repositories/Recurring/FiltersWeekends.php
index 222879cc298..e93d9b9bbfc 100644
--- a/app/Support/Repositories/Recurring/FiltersWeekends.php
+++ b/app/Support/Repositories/Recurring/FiltersWeekends.php
@@ -53,7 +53,6 @@ protected function filterWeekends(RecurrenceRepetition $repetition, array $dates
             if (!$isWeekend) {
                 $return[] = clone $date;
 
-                // app('log')->debug(sprintf('Date is %s, not a weekend date.', $date->format('D d M Y')));
                 continue;
             }
 
@@ -80,7 +79,6 @@ protected function filterWeekends(RecurrenceRepetition $repetition, array $dates
 
                 continue;
             }
-            // app('log')->debug(sprintf('Date is %s, removed from final result', $date->format('D d M Y')));
         }
 
         // filter unique dates
diff --git a/app/Support/Search/QueryParser/Node.php b/app/Support/Search/QueryParser/Node.php
index 31412cfdab8..6114d91b44f 100644
--- a/app/Support/Search/QueryParser/Node.php
+++ b/app/Support/Search/QueryParser/Node.php
@@ -79,11 +79,9 @@ public function equals(self $compare): bool
     public function isProhibited(bool $flipFlag): bool
     {
         if ($flipFlag) {
-            // Log::debug(sprintf('This %s is (flipped) now prohibited: %s',get_class($this), var_export(!$this->prohibited, true)));
             return !$this->prohibited;
         }
 
-        // Log::debug(sprintf('This %s is (not flipped) now prohibited: %s',get_class($this), var_export($this->prohibited, true)));
         return $this->prohibited;
 
     }
diff --git a/app/Support/Search/QueryParser/QueryParser.php b/app/Support/Search/QueryParser/QueryParser.php
index c9072f970b1..93ec7c92a75 100644
--- a/app/Support/Search/QueryParser/QueryParser.php
+++ b/app/Support/Search/QueryParser/QueryParser.php
@@ -71,7 +71,6 @@ private function buildNextNode(bool $isSubquery): NodeResult
 
         while ($this->position < strlen($this->query)) {
             $char = $this->query[$this->position];
-            // Log::debug(sprintf('Char #%d: %s', $this->position, $char));
 
             // If we're in a quoted string, we treat all characters except another quote as ordinary characters
             if ($inQuotes) {
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index 0d1cca50fad..f4244507325 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -63,7 +63,6 @@ public function bcround(?string $number, int $precision = 0): string
             $number = sprintf('%.12f', $number);
         }
 
-        // Log::debug(sprintf('Trying bcround("%s",%d)', $number, $precision));
         if (str_contains($number, '.')) {
             if ('-' !== $number[0]) {
                 return bcadd($number, '0.'.str_repeat('0', $precision).'5', $precision);
@@ -90,7 +89,7 @@ public function filterAccountBalances(array $total, Account $account, bool $conv
     public function filterAccountBalance(array $set, Account $account, bool $convertToPrimary, ?TransactionCurrency $currency = null): array
     {
         Log::debug(sprintf('filterAccountBalance(#%d)', $account->id), $set);
-        if (0 === count($set)) {
+        if (empty($set)) {
             Log::debug(sprintf('Return empty array for account #%d', $account->id));
 
             return [];
@@ -350,7 +349,7 @@ public function accountsBalancesOptimized(Collection $accounts, Carbon $date, ?T
             $accountSum           = array_filter($arrayOfSums, function ($entry) use ($account) {
                 return $entry['account_id'] === $account->id;
             });
-            if (0 === count($accountSum)) {
+            if (empty($accountSum)) {
                 $result[$account->id] = $return;
 
                 continue;
@@ -367,12 +366,10 @@ public function accountsBalancesOptimized(Collection $accounts, Carbon $date, ?T
             $return['balance']    = $sumsByCode[$currency->code] ?? '0';
             if (!$convertToPrimary) {
                 unset($return['pc_balance']);
-                // Log::debug(sprintf('Set balance to %s, unset pc_balance', $return['balance']));
             }
             // if there is a request to convert, convert to "pc_balance" and use "balance" for whichever amount is in the primary currency.
             if ($convertToPrimary) {
                 $return['pc_balance'] = $this->convertAllBalances($sumsByCode, $primary, $date);
-                // Log::debug(sprintf('Set pc_balance to %s', $return['pc_balance']));
             }
 
             // either way, the balance is always combined with the virtual balance:
@@ -383,16 +380,13 @@ public function accountsBalancesOptimized(Collection $accounts, Carbon $date, ?T
                 $converter            = new ExchangeRateConverter();
                 $pcVirtualBalance     = $converter->convert($currency, $primary, $date, $virtualBalance);
                 $return['pc_balance'] = bcadd($pcVirtualBalance, $return['pc_balance']);
-                // Log::debug(sprintf('Primary virtual balance makes the primary total %s', $return['pc_balance']));
             }
             if (!$convertToPrimary) {
                 // if not, also increase the balance + primary balance for consistency.
                 $return['balance'] = bcadd($return['balance'], $virtualBalance);
-                // Log::debug(sprintf('Virtual balance makes the (primary currency) total %s', $return['balance']));
             }
             $final                = array_merge($return, $sumsByCode);
             $result[$account->id] = $final;
-            // Log::debug('Final balance is', $final);
         }
 
         return $result;
@@ -420,9 +414,7 @@ public function finalAccountBalance(Account $account, Carbon $date, ?Transaction
         if ($cache->has()) {
             Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
 
-            // return $cache->get();
         }
-        // Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
         if (null === $convertToPrimary) {
             $convertToPrimary = Amount::convertToPrimary($account->user);
         }
@@ -457,7 +449,6 @@ public function finalAccountBalance(Account $account, Carbon $date, ?Transaction
         $return['balance'] = $others[$currency->code] ?? '0';
         if (!$convertToPrimary) {
             unset($return['pc_balance']);
-            // Log::debug(sprintf('Set balance to %s, unset pc_balance', $return['balance']));
         }
         // if there is a request to convert, convert to "pc_balance" and use "balance" for whichever amount is in the primary currency.
         if ($convertToPrimary) {
@@ -473,15 +464,12 @@ public function finalAccountBalance(Account $account, Carbon $date, ?Transaction
             $converter            = new ExchangeRateConverter();
             $pcVirtualBalance     = $converter->convert($currency, $primary, $date, $virtualBalance);
             $return['pc_balance'] = bcadd($pcVirtualBalance, $return['pc_balance']);
-            // Log::debug(sprintf('Primary virtual balance makes the primary total %s', $return['pc_balance']));
         }
         if (!$convertToPrimary) {
             // if not, also increase the balance + primary balance for consistency.
             $return['balance'] = bcadd($return['balance'], $virtualBalance);
-            // Log::debug(sprintf('Virtual balance makes the (primary currency) total %s', $return['balance']));
         }
         $final             = array_merge($return, $others);
-        // Log::debug('Final balance is', $final);
         $cache->store($final);
 
         return $final;
@@ -639,7 +627,6 @@ public function getLocaleArray(string $locale): array
      */
     public function getSafePreviousUrl(): string
     {
-        // Log::debug(sprintf('getSafePreviousUrl: "%s"', session()->previousUrl()));
         return session()->previousUrl() ?? route('index');
     }
 
@@ -648,7 +635,6 @@ public function getSafePreviousUrl(): string
      */
     public function getSafeUrl(string $unknownUrl, string $safeUrl): string
     {
-        // Log::debug(sprintf('getSafeUrl(%s, %s)', $unknownUrl, $safeUrl));
         $returnUrl      = $safeUrl;
         $unknownHost    = parse_url($unknownUrl, PHP_URL_HOST);
         $safeHost       = parse_url($safeUrl, PHP_URL_HOST);
diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index b2c4fc9bcb4..9f46bf679b8 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -104,7 +104,6 @@ static function (?Account $account): string {
                 }
 
                 return implode(', ', $strings);
-                // return app('steam')->balance($account, $date);
             }
         );
     }
diff --git a/app/TransactionRules/Actions/SetCategory.php b/app/TransactionRules/Actions/SetCategory.php
index c546dcad1a9..590dd4d2d4a 100644
--- a/app/TransactionRules/Actions/SetCategory.php
+++ b/app/TransactionRules/Actions/SetCategory.php
@@ -85,7 +85,6 @@ public function actOnArray(array $journal): bool
         $oldCategory     = $object->categories()->first();
         $oldCategoryName = $oldCategory?->name;
         if ((int) $oldCategory?->id === $category->id) {
-            // event(new RuleActionFailedOnArray($this->action, $journal, trans('rules.already_linked_to_category', ['name' => $category->name])));
 
             return false;
         }
diff --git a/app/TransactionRules/Engine/SearchRuleEngine.php b/app/TransactionRules/Engine/SearchRuleEngine.php
index f8f8700a7e2..d01fe5618ac 100644
--- a/app/TransactionRules/Engine/SearchRuleEngine.php
+++ b/app/TransactionRules/Engine/SearchRuleEngine.php
@@ -295,7 +295,6 @@ static function (array $group) {
                 }
 
                 return sprintf('%d%s', $group['id'], $str);
-                // Log::debug(sprintf('Return key: %s ', $key));
             }
         );
 
diff --git a/database/seeders/TransactionCurrencySeeder.php b/database/seeders/TransactionCurrencySeeder.php
index e29de2d63c6..fc6bde601b7 100644
--- a/database/seeders/TransactionCurrencySeeder.php
+++ b/database/seeders/TransactionCurrencySeeder.php
@@ -68,7 +68,6 @@ public function run(): void
         $currencies[] = ['code' => 'JPY', 'name' => 'Japanese yen', 'symbol' => '¥', 'decimal_places' => 0];
         $currencies[] = ['code' => 'CNY', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2];
         $currencies[] = ['code' => 'KRW', 'name' => 'South Korean won','symbol' => '₩', 'decimal_places' => 2,];
-        //        $currencies[] = ['code' => 'RMB', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2];
         $currencies[] = ['code' => 'RUB', 'name' => 'Russian ruble', 'symbol' => '₽', 'decimal_places' => 2];
         $currencies[] = ['code' => 'INR', 'name' => 'Indian rupee', 'symbol' => '₹', 'decimal_places' => 2];
 
diff --git a/resources/assets/v1/src/app.js b/resources/assets/v1/src/app.js
index 7a39d988a39..29e0a4a9bd0 100644
--- a/resources/assets/v1/src/app.js
+++ b/resources/assets/v1/src/app.js
@@ -24,7 +24,7 @@
 */
 
 try {
-    window.$ = window.jQuery = require('jquery');
+    globalThis.$ = globalThis.jQuery = require('jquery');
 
     require('bootstrap-sass');
 } catch (e) {
diff --git a/resources/assets/v1/src/app_vue.js b/resources/assets/v1/src/app_vue.js
index 42910613f43..84702e496e4 100644
--- a/resources/assets/v1/src/app_vue.js
+++ b/resources/assets/v1/src/app_vue.js
@@ -25,8 +25,8 @@ import Vue from 'vue';
 import VueI18n from 'vue-i18n'
 import * as uiv from 'uiv';
 
-window.vuei18n = VueI18n;
-window.uiv = uiv;
+globalThis.vuei18n = VueI18n;
+globalThis.uiv = uiv;
 Vue.use(vuei18n);
 Vue.use(uiv);
-window.Vue = Vue;
+globalThis.Vue = Vue;
diff --git a/resources/assets/v1/src/bootstrap.js b/resources/assets/v1/src/bootstrap.js
index ecf244473ff..425566e5b20 100644
--- a/resources/assets/v1/src/bootstrap.js
+++ b/resources/assets/v1/src/bootstrap.js
@@ -24,9 +24,9 @@
  * CSRF token as a header based on the value of the "XSRF" token cookie.
  */
 
-window.axios = require('axios');
+globalThis.axios = require('axios');
 
-window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+globalThis.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
 /**
  * Next we will register the CSRF Token as a common header with Axios so that
@@ -37,7 +37,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 let token = document.head.querySelector('meta[name="csrf-token"]');
 
 if (token) {
-    window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
+    globalThis.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
 } else {
     console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
 }
diff --git a/resources/assets/v1/src/components/administrations/Edit.vue b/resources/assets/v1/src/components/administrations/Edit.vue
index 24890c96ea2..b901e52ebde 100644
--- a/resources/assets/v1/src/components/administrations/Edit.vue
+++ b/resources/assets/v1/src/components/administrations/Edit.vue
@@ -110,8 +110,8 @@ export default {
         };
     },
     mounted() {
-        const page = window.location.href.split('/');
-        const administrationId = parseInt(page[page.length - 1]);
+        const page = globalThis.location.href.split('/');
+        const administrationId = Number.parseInt(page[page.length - 1]);
         this.downloadAdministration(administrationId);
     },
     methods: {
@@ -121,7 +121,7 @@ export default {
                 this.administration = {
                     id: current.id,
                     title: current.attributes.title,
-                    currency_id: parseInt(current.attributes.primary_currency_id),
+                    currency_id: Number.parseInt(current.attributes.primary_currency_id),
                     currency_code: current.attributes.primary_currency_code,
                     currency_name: current.attributes.primary_currency_name,
                 };
@@ -143,13 +143,13 @@ export default {
             // collect data
             let data = {
                 title: this.administration.title,
-                primary_currency_id: parseInt(this.administration.currency_id),
+                primary_currency_id: Number.parseInt(this.administration.currency_id),
             };
 
             // post!
             axios.put('./api/v1/user-groups/' + this.administration.id, data).then((response) => {
-                let administrationId = parseInt(response.data.data.id);
-                window.location.href = './administrations?user_group_id=' + administrationId + '&message=updated';
+                let administrationId = Number.parseInt(response.data.data.id);
+                globalThis.location.href = './administrations?user_group_id=' + administrationId + '&message=updated';
             }).catch((error) => {
 
                 this.error_message = error.response.data.message;
diff --git a/resources/assets/v1/src/components/exchange-rates/Index.vue b/resources/assets/v1/src/components/exchange-rates/Index.vue
index 2a656ae5df5..381e0d784e1 100644
--- a/resources/assets/v1/src/components/exchange-rates/Index.vue
+++ b/resources/assets/v1/src/components/exchange-rates/Index.vue
@@ -104,7 +104,7 @@ export default {
                 }
 
                 if (response.data.meta.pagination.current_page < response.data.meta.pagination.total_pages) {
-                    this.downloadCurrencies(parseInt(response.data.meta.pagination.current_page) + 1);
+                    this.downloadCurrencies(Number.parseInt(response.data.meta.pagination.current_page) + 1);
                 }
             });
         },
diff --git a/resources/assets/v1/src/components/exchange-rates/Rates.vue b/resources/assets/v1/src/components/exchange-rates/Rates.vue
index 0ac13a94ad0..9aef1eaf058 100644
--- a/resources/assets/v1/src/components/exchange-rates/Rates.vue
+++ b/resources/assets/v1/src/components/exchange-rates/Rates.vue
@@ -217,14 +217,14 @@ export default {
     mounted() {
         // get from and to code from URL
         this.newDate = format(new Date, 'yyyy-MM-dd');
-        let parts = window.location.href.split('/');
+        let parts = globalThis.location.href.split('/');
         this.from_code = parts[parts.length - 2];
         this.to_code = parts[parts.length - 1];
 
-        const params = new Proxy(new URLSearchParams(window.location.search), {
+        const params = new Proxy(new URLSearchParams(globalThis.location.search), {
             get: (searchParams, prop) => searchParams.get(prop),
         });
-        this.page = parseInt(params.page ?? 1);
+        this.page = Number.parseInt(params.page ?? 1);
 
 
         this.downloadCurrencies();
@@ -276,12 +276,10 @@ export default {
             }
         },
         deleteRate: function (index) {
-            // console.log(this.rates[index].key);
             let parts = this.spliceKey(this.rates[index].key);
             if (0 === parts.length) {
                 return;
             }
-            // console.log(parts);
 
             // delete A to B
             axios.delete("./api/v1/exchange-rates/" + parts.from + '/' + parts.to + '/' + format(parts.date, 'yyyy-MM-dd'));
@@ -316,7 +314,6 @@ export default {
                 }
             });
             axios.get("./api/v1/currencies/" + this.to_code).then((response) => {
-                // console.log(response.data.data);
                 this.to = {
                     id: response.data.data.id,
                     code: response.data.data.attributes.code,
@@ -339,16 +336,13 @@ export default {
                         let rate_id = current.id;
                         let inverse_id = '0';
                         let key = from_code + '_' + to_code + '_' + format(date, 'yyyy-MM-dd');
-                        // console.log('Key is now "' + key + '"');
 
                         // perhaps the returned rate is actually the inverse rate.
                         if (from_code === this.to_code && to_code === this.from_code) {
-                            // console.log('Inverse rate found!');
                             key = to_code + '_' + from_code + '_' + format(date, 'yyyy-MM-dd');
                             rate = '';
                             inverse = current.attributes.rate;
                             inverse_id = current.id;
-                            // console.log('Key updated to "' + key + '"');
                         }
 
                         if (!this.tempRates.hasOwnProperty(key)) {
@@ -378,10 +372,9 @@ export default {
 
                     }
                 }
-                this.totalPages = parseInt(response.data.meta.pagination.total_pages);
+                this.totalPages = Number.parseInt(response.data.meta.pagination.total_pages);
                 this.loading = false;
                 this.rates = Object.values(this.tempRates);
-                // console.log('Do not download more pages. Now on page ' + this.page + ' of ' + this.totalPages);
             });
         }
     },
diff --git a/resources/assets/v1/src/components/form/Checkbox.vue b/resources/assets/v1/src/components/form/Checkbox.vue
index 3d05fa8acb6..baf17e8855e 100644
--- a/resources/assets/v1/src/components/form/Checkbox.vue
+++ b/resources/assets/v1/src/components/form/Checkbox.vue
@@ -59,7 +59,6 @@ export default {
   },
   methods: {
     handleInput() {
-      // console.log(this.active);
       this.$emit('input', this.active);
     },
   },
diff --git a/resources/assets/v1/src/components/form/UserGroupCurrency.vue b/resources/assets/v1/src/components/form/UserGroupCurrency.vue
index fbd483b69db..750b71f558b 100644
--- a/resources/assets/v1/src/components/form/UserGroupCurrency.vue
+++ b/resources/assets/v1/src/components/form/UserGroupCurrency.vue
@@ -95,7 +95,7 @@ export default {
               }
 
               if (response.data.meta.pagination.current_page < response.data.meta.pagination.total_pages) {
-                  this.downloadCurrencies(parseInt(response.data.meta.pagination.current_page) + 1);
+                  this.downloadCurrencies(Number.parseInt(response.data.meta.pagination.current_page) + 1);
               }
           });
       },
diff --git a/resources/assets/v1/src/components/transactions/AccountSelect.vue b/resources/assets/v1/src/components/transactions/AccountSelect.vue
index 4e3f3b1b1b1..7754df46116 100644
--- a/resources/assets/v1/src/components/transactions/AccountSelect.vue
+++ b/resources/assets/v1/src/components/transactions/AccountSelect.vue
@@ -107,13 +107,11 @@ export default {
     }
   },
   ready() {
-    // console.log('ready(): this.name = this.accountName (' + this.accountName + ')');
     this.name = this.accountName;
   },
   mounted() {
     this.target = this.$refs.input;
     this.updateACURI(this.allowedTypes.join(','));
-    // console.log('mounted(): this.name = this.accountName (' + this.accountName + ')');
     this.name = this.accountName;
     this.triggerTransactionType();
   },
@@ -123,7 +121,6 @@ export default {
       this.triggerTransactionType();
     },
     accountName() {
-      // console.log('AccountSelect watch accountName!');
       this.name = this.accountName;
     },
     accountTypeFilters() {
@@ -176,22 +173,17 @@ export default {
               '?types=' +
               types +
               '&query=';
-          // console.log('Auto complete URI is now ' + this.accountAutoCompleteURI);
         },
         hasError: function () {
           return this.error.length > 0;
         },
         triggerTransactionType: function () {
-          // console.log('On triggerTransactionType(' + this.inputName + ')');
           if (null === this.name) {
-            // console.log('this.name is NULL.');
           }
           if (null === this.transactionType) {
-            // console.log('Transaction type is NULL.');
             return;
           }
           if ('' === this.transactionType) {
-            // console.log('Transaction type is "".');
             return;
           }
           this.inputDisabled = false;
@@ -216,13 +208,10 @@ export default {
           }
         },
         selectedItem: function (e) {
-          // console.log('In SelectedItem()');
           if (typeof this.name === 'undefined') {
-            // console.log('Is undefined');
             return;
           }
           if (typeof this.name === 'string') {
-            // console.log('Is a string.');
             //this.trType = null;
             this.$emit('clear:value');
           }
@@ -233,7 +222,6 @@ export default {
           this.$emit('select:account', this.name);
         },
         clearSource: function (e) {
-          // console.log('clearSource()');
           //props.value = '';
           this.name = '';
           // some event?
diff --git a/resources/assets/v1/src/components/transactions/Amount.vue b/resources/assets/v1/src/components/transactions/Amount.vue
index d1b358e3111..7a5dcb9aba0 100644
--- a/resources/assets/v1/src/components/transactions/Amount.vue
+++ b/resources/assets/v1/src/components/transactions/Amount.vue
@@ -78,7 +78,6 @@ export default {
       return this.error.length > 0;
     },
     changeData: function () {
-      //console.log('Triggered amount changeData()');
       let transactionType = this.transactionType;
       // reset of all are empty:
       if (!transactionType && !this.source.name && !this.destination.name) {
@@ -130,23 +129,18 @@ export default {
   },
   watch: {
     source: function () {
-      // console.log('amount: watch source triggered');
       this.changeData();
     },
     value: function () {
-      // console.log('amount: value changed');
     },
     destination: function () {
-      // console.log('amount: watch destination triggered');
       this.changeData();
     },
     transactionType: function () {
-      // console.log('amount: watch transaction type triggered');
       this.changeData();
     }
   },
   mounted() {
-    // console.log('amount: mounted');
     this.changeData();
   }
 }
diff --git a/resources/assets/v1/src/components/transactions/Bill.vue b/resources/assets/v1/src/components/transactions/Bill.vue
index fd2daa8645b..30c977ffa16 100644
--- a/resources/assets/v1/src/components/transactions/Bill.vue
+++ b/resources/assets/v1/src/components/transactions/Bill.vue
@@ -61,7 +61,6 @@ export default {
     no_bill: String,
   },
   mounted() {
-    // console.log('bill: mounted');
     this.loadBills();
   },
   data() {
@@ -72,7 +71,6 @@ export default {
   },
   watch: {
     value: function () {
-      // console.log('bill: value changed to ' + this.value);
       this.selected = this.value;
     }
   },
diff --git a/resources/assets/v1/src/components/transactions/Budget.vue b/resources/assets/v1/src/components/transactions/Budget.vue
index 259752d435e..2d24445bc80 100644
--- a/resources/assets/v1/src/components/transactions/Budget.vue
+++ b/resources/assets/v1/src/components/transactions/Budget.vue
@@ -71,7 +71,6 @@ export default {
   },
   watch: {
     value: function () {
-      // console.log('budget: value changed to ' + this.value);
       this.selected = this.value;
     }
   },
diff --git a/resources/assets/v1/src/components/transactions/Category.vue b/resources/assets/v1/src/components/transactions/Category.vue
index 990798f6d7f..5c3f910e212 100644
--- a/resources/assets/v1/src/components/transactions/Category.vue
+++ b/resources/assets/v1/src/components/transactions/Category.vue
@@ -145,7 +145,6 @@ export default {
 
     },
     clearCategory: function () {
-      //props.value = '';
       this.name = '';
       this.$refs.input.value = '';
       this.$emit('input', this.$refs.input.value);
@@ -169,7 +168,6 @@ export default {
     handleEnter: function (e) {
       // TODO feels sloppy
       if (e.keyCode === 13) {
-        //e.preventDefault();
       }
     }
   }
diff --git a/resources/assets/v1/src/components/transactions/CreateTransaction.vue b/resources/assets/v1/src/components/transactions/CreateTransaction.vue
index c1969353be3..6cbabe5e883 100644
--- a/resources/assets/v1/src/components/transactions/CreateTransaction.vue
+++ b/resources/assets/v1/src/components/transactions/CreateTransaction.vue
@@ -280,23 +280,23 @@ export default {
     },
     methods: {
         prefillSourceAccount() {
-            if (0 === window.sourceId) {
+            if (0 === globalThis.sourceId) {
                 return;
             }
-            this.getAccount(window.sourceId, 'source_account');
+            this.getAccount(globalThis.sourceId, 'source_account');
         },
         prefillDestinationAccount() {
             if (0 === destinationId) {
                 return;
             }
-            this.getAccount(window.destinationId, 'destination_account');
+            this.getAccount(globalThis.destinationId, 'destination_account');
         },
         getAccount(accountId, slot) {
             const uri = './api/v1/accounts/' + accountId + '?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
             axios.get(uri).then(response => {
                 let model = response.data.data.attributes;
                 model.type = this.fullAccountType(model.type, model.liability_type);
-                model.id = parseInt(response.data.data.id);
+                model.id = Number.parseInt(response.data.data.id);
                 if ('source_account' === slot) {
                     this.selectedSourceAccount(0, model);
                 }
@@ -323,7 +323,6 @@ export default {
             return arr[searchType] ?? searchType;
         },
         convertData: function () {
-            // console.log('Now in convertData()');
             let data = {
                 'apply_rules': this.applyRules,
                 'fire_webhooks': this.fireWebhooks,
@@ -344,7 +343,6 @@ export default {
             // the presence of a source or destination account
             firstSource = this.transactions[0].source_account.type;
             firstDestination = this.transactions[0].destination_account.type;
-            // console.log('Type of first source is  ' + firstSource);
 
             if ('invalid' === transactionType && ['asset', 'Asset account', 'Loan', 'Debt', 'Mortgage'].includes(firstSource)) {
                 transactionType = 'withdrawal';
@@ -368,7 +366,6 @@ export default {
             return data;
         },
         convertDataRow(row, index, transactionType) {
-            // console.log('Now in convertDataRow()');
             let tagList = [];
             let foreignAmount = null;
             let foreignCurrency = null;
@@ -391,12 +388,12 @@ export default {
 
             // if type is 'withdrawal' and destination is empty, cash withdrawal.
             if (transactionType === 'withdrawal' && '' === destName) {
-                destId = window.cashAccountId;
+                destId = globalThis.cashAccountId;
             }
 
             // if type is 'deposit' and source is empty, cash deposit.
             if (transactionType === 'deposit' && '' === sourceName) {
-                sourceId = window.cashAccountId;
+                sourceId = globalThis.cashAccountId;
             }
 
             // if index is over 0 and type is withdrawal or transfer, take source from index 0.
@@ -420,7 +417,7 @@ export default {
             }
 
             // set foreign currency info:
-            if (row.foreign_amount.amount !== '' && parseFloat(row.foreign_amount.amount) !== .00) {
+            if (row.foreign_amount.amount !== '' && Number.parseFloat(row.foreign_amount.amount) !== .00) {
                 foreignAmount = row.foreign_amount.amount;
                 foreignCurrency = row.foreign_amount.currency_id;
             }
@@ -480,20 +477,19 @@ export default {
                 currentArray.foreign_currency_id = foreignCurrency;
             }
             // set budget id and piggy ID.
-            if (parseInt(row.budget) > 0) {
-                currentArray.budget_id = parseInt(row.budget);
+            if (Number.parseInt(row.budget) > 0) {
+                currentArray.budget_id = Number.parseInt(row.budget);
             }
-            if (parseInt(row.bill) > 0) {
-                currentArray.bill_id = parseInt(row.bill);
+            if (Number.parseInt(row.bill) > 0) {
+                currentArray.bill_id = Number.parseInt(row.bill);
             }
-            if (parseInt(row.piggy_bank) > 0) {
-                currentArray.piggy_bank_id = parseInt(row.piggy_bank);
+            if (Number.parseInt(row.piggy_bank) > 0) {
+                currentArray.piggy_bank_id = Number.parseInt(row.piggy_bank);
             }
             return currentArray;
         },
         // submit transaction
         submit(e) {
-            // console.log('Now in submit()');
             const uri = './api/v1/transactions?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
             const data = this.convertData();
 
@@ -504,7 +500,6 @@ export default {
                 // console.log('Did a successful POST');
                 // this method will ultimately send the user on (or not).
                 if (0 === this.collectAttachmentData(response)) {
-                    // console.log('Will now go to redirectUser()');
                     this.redirectUser(response.data.data.id, response.data.data);
                 }
             }).catch(error => {
@@ -530,7 +525,6 @@ export default {
             return div.innerHTML;
         },
         redirectUser(groupId, transactionData) {
-            // console.log('In redirectUser()');
             // console.log(transactionData);
             let title = null === transactionData.attributes.group_title ? transactionData.attributes.transactions[0].description : transactionData.attributes.group_title;
             // console.log('Title is "' + title + '"');
@@ -547,7 +541,6 @@ export default {
                     this.resetTransactions();
                     // do a short time out?
                     setTimeout(() => this.addTransactionToArray(), 50);
-                    //this.addTransactionToArray();
                 }
 
                 // clear errors:
@@ -557,13 +550,11 @@ export default {
                 let button = $('#submitButton');
                 button.removeAttr('disabled');
             } else {
-                //console.log('Will redirect to previous URL. (' + previousUrl + ')');
-                window.location.href = window.previousUrl + '?transaction_group_id=' + groupId + '&message=created';
+                globalThis.location.href = globalThis.previousUrl + '?transaction_group_id=' + groupId + '&message=created';
             }
         },
 
         collectAttachmentData(response) {
-            // console.log('Now incollectAttachmentData()');
             let groupId = response.data.data.id;
 
             // reverse list of transactions?
@@ -594,7 +585,6 @@ export default {
                 }
             }
             let count = toBeUploaded.length;
-            // console.log('Found ' + toBeUploaded.length + ' attachments.');
 
             // loop all uploads.
             for (const key in toBeUploaded) {
@@ -638,31 +628,26 @@ export default {
                     };
                     axios.post(uri, data)
                         .then(response => {
-                            // console.log('Created attachment #' + key);
                             // console.log('Uploading attachment #' + key);
                             const uploadUri = './api/v1/attachments/' + response.data.data.id + '/upload';
                             axios.post(uploadUri, fileData[key].content)
                                 .then(attachmentResponse => {
-                                    // console.log('Uploaded attachment #' + key);
                                     uploads++;
                                     if (uploads === count) {
                                         // finally we can redirect the user onwards.
                                         // console.log('FINAL UPLOAD');
                                         this.redirectUser(groupId, transactionData);
                                     }
-                                    // console.log('Upload complete!');
                                     return true;
                                 }).catch(error => {
                                 console.error('Could not upload');
                                 console.error(error);
-                                // console.log('Uploaded attachment #' + key);
                                 uploads++;
                                 if (uploads === count) {
                                     // finally we can redirect the user onwards.
                                     // console.log('FINAL UPLOAD');
                                     this.redirectUser(groupId, transactionData);
                                 }
-                                // console.log('Upload complete!');
                                 return false;
                             });
                         }).catch(error => {
@@ -674,7 +659,6 @@ export default {
                             // console.log('FINAL UPLOAD');
                             this.redirectUser(groupId, transactionData);
                         }
-                        // console.log('Upload complete!');
                         return false;
                     });
                 }
@@ -686,7 +670,6 @@ export default {
         setDefaultErrors: function () {
             for (const key in this.transactions) {
                 if (this.transactions.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-                    // console.log('Set default errors for key ' + key);
                     //this.transactions[key].description
                     this.transactions[key].errors = {
                         source_account: [],
@@ -737,7 +720,7 @@ export default {
                     }
                     if (key !== 'group_title') {
                         // lol dumbest way to explode "transactions.0.something" ever.
-                        transactionIndex = parseInt(key.split('.')[1]);
+                        transactionIndex = Number.parseInt(key.split('.')[1]);
                         fieldName = key.split('.')[2];
                         // set error in this object thing.
                         switch (fieldName) {
@@ -784,13 +767,11 @@ export default {
             }
         },
         resetTransactions: function () {
-            // console.log('Now in resetTransactions()');
             this.transactions = [];
             this.group_title = '';
 
         },
         addTransactionToArray: function (e) {
-            // console.log('Now in addTransactionToArray()');
             this.transactions.push({
                 description: "",
                 date: "",
@@ -871,7 +852,6 @@ export default {
                 let today = new Date();
                 this.transactions[0].date = today.getFullYear() + '-' + ("0" + (today.getMonth() + 1)).slice(-2) + '-' + ("0" + today.getDate()).slice(-2)
                 + 'T'+ ("0" + today.getHours()).slice(-2) +':' + ("0" + today.getMinutes()).slice(-2);
-                //console.log(this.transactions[0].date);
 
                 // call for extra clear thing:
                 // this.clearSource(0);
@@ -887,7 +867,6 @@ export default {
 
         deleteTransaction: function (index, event) {
             event.preventDefault();
-            // console.log('Remove transaction.');
             this.transactions.splice(index, 1);
         },
         limitSourceType: function (type) {
@@ -904,7 +883,6 @@ export default {
         },
 
         selectedSourceAccount: function (index, model) {
-            // console.log('Now in selectedSourceAccount()');
             if (typeof model === 'string') {
                 //console.log('model is string.')
                 // cant change types, only name.
@@ -930,13 +908,11 @@ export default {
                 }
 
                 // force types on destination selector.
-                this.transactions[index].destination_account.allowed_types = window.allowedOpposingTypes.source[model.type];
+                this.transactions[index].destination_account.allowed_types = globalThis.allowedOpposingTypes.source[model.type];
             }
-            //console.log('Transactions:');
             //console.log(this.transactions);
         },
         selectedDestinationAccount: function (index, model) {
-            // console.log('Now in selectedDestinationAccount()');
             if (typeof model === 'string') {
                 // cant change types, only name.
                 this.transactions[index].destination_account.name = model;
@@ -960,7 +936,7 @@ export default {
                 }
 
                 // force types on destination selector.
-                this.transactions[index].source_account.allowed_types = window.allowedOpposingTypes.destination[model.type];
+                this.transactions[index].source_account.allowed_types = globalThis.allowedOpposingTypes.destination[model.type];
             }
         },
         clearSource: function (index) {
diff --git a/resources/assets/v1/src/components/transactions/CustomAttachments.vue b/resources/assets/v1/src/components/transactions/CustomAttachments.vue
index b140dbda4d2..de64ddde552 100644
--- a/resources/assets/v1/src/components/transactions/CustomAttachments.vue
+++ b/resources/assets/v1/src/components/transactions/CustomAttachments.vue
@@ -56,7 +56,6 @@ export default {
     error: Array
   },
   mounted: function () {
-    // window.addEventListener('paste', e => {
     //   this.$refs.input.files = e.clipboardData.files;
     // });
   },
diff --git a/resources/assets/v1/src/components/transactions/CustomDate.vue b/resources/assets/v1/src/components/transactions/CustomDate.vue
index f90617dfc9e..dc389e93cd2 100644
--- a/resources/assets/v1/src/components/transactions/CustomDate.vue
+++ b/resources/assets/v1/src/components/transactions/CustomDate.vue
@@ -64,7 +64,6 @@ export default {
       return this.error.length > 0;
     },
     clearDate: function () {
-      //props.value = '';
       this.name = '';
       this.$refs.date.value = '';
       this.$emit('input', this.$refs.date.value);
diff --git a/resources/assets/v1/src/components/transactions/CustomString.vue b/resources/assets/v1/src/components/transactions/CustomString.vue
index 75dd3fb8c36..4fde39161b9 100644
--- a/resources/assets/v1/src/components/transactions/CustomString.vue
+++ b/resources/assets/v1/src/components/transactions/CustomString.vue
@@ -61,7 +61,6 @@ export default {
       this.$emit('input', this.$refs.str.value);
     },
     clearField: function () {
-      //props.value = '';
       this.name = '';
       this.$refs.str.value = '';
       this.$emit('input', this.$refs.str.value);
diff --git a/resources/assets/v1/src/components/transactions/CustomTransactionFields.vue b/resources/assets/v1/src/components/transactions/CustomTransactionFields.vue
index e55fcf00146..6abfd877dd0 100644
--- a/resources/assets/v1/src/components/transactions/CustomTransactionFields.vue
+++ b/resources/assets/v1/src/components/transactions/CustomTransactionFields.vue
@@ -119,7 +119,6 @@ export default {
     },
     getPreference() {
 
-      // Vue.component('custom-date', (resolve) => {
       //      console.log('loaded');
       //  });
 
diff --git a/resources/assets/v1/src/components/transactions/EditTransaction.vue b/resources/assets/v1/src/components/transactions/EditTransaction.vue
index 1855355d7c9..da48a1708a8 100644
--- a/resources/assets/v1/src/components/transactions/EditTransaction.vue
+++ b/resources/assets/v1/src/components/transactions/EditTransaction.vue
@@ -287,11 +287,9 @@ export default {
         groupId: Number
     },
     mounted() {
-        // console.log('EditTransaction: mounted()');
         this.getGroup();
     },
     ready() {
-        // console.log('EditTransaction: ready()');
     },
     methods: {
         positiveAmount(amount) {
@@ -337,7 +335,6 @@ export default {
                 this.transactions[index].destination_account.name = model;
                 return;
             }
-            // console.log('selectedDestinationAccount');
             this.transactions[index].destination_account = {
                 id: model.id,
                 name: model.name,
@@ -354,7 +351,6 @@ export default {
                 this.transactions[index].destination_account.currency_code = model.account_currency_code;
                 this.transactions[index].destination_account.currency_decimal_places = model.account_currency_decimal_places;
             }
-            // console.log('Selected destination account currency ID  = ' + this.transactions[index].destination_account.currency_id);
         },
         clearSource(index) {
             // reset source account:
@@ -407,17 +403,14 @@ export default {
                 this.selectedSourceAccount(index, this.transactions[index].source_account);
             }
 
-            // console.log('Destination allowed types after:');
             // console.log(this.transactions[index].destination_account.allowed_types);
         },
         getGroup() {
-            // console.log('EditTransaction: getGroup()');
-            const page = window.location.href.split('/');
-            const groupId = parseInt(page[page.length - 1]);
+            const page = globalThis.location.href.split('/');
+            const groupId = Number.parseInt(page[page.length - 1]);
 
 
             const uri = './api/v1/transactions/' + groupId;
-            // console.log(uri);
 
             // fill in transactions array.
             axios.get(uri)
@@ -430,7 +423,6 @@ export default {
                 });
         },
         processIncomingGroup(data) {
-            // console.log('EditTransaction: processIncomingGroup()');
             this.group_title = data.attributes.group_title;
             let transactions = data.attributes.transactions.reverse();
             for (let key in transactions) {
@@ -448,7 +440,6 @@ export default {
             return null;
         },
         processIncomingGroupRow(transaction) {
-            //console.log('EditTransaction: processIncomingGroupRow()');
             this.setTransactionType(transaction.type);
 
             if (true === transaction.reconciled) {
@@ -461,13 +452,12 @@ export default {
                     newTags.push({text: transaction.tags[key], tiClasses: []});
                 }
             }
-            // console.log('source allowed types for a ' + transaction.type);
-            //console.log(window.expectedSourceTypes.source[transaction.type]);
-            // console.log(window.expectedSourceTypes.source[this.ucFirst(transaction.type)]);
+            //console.log(globalThis.expectedSourceTypes.source[transaction.type]);
+            // console.log(globalThis.expectedSourceTypes.source[this.ucFirst(transaction.type)]);
             // console.log('destination allowed types for a ' + transaction.type);
-            // console.log(window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]);
-            if (typeof window.expectedSourceTypes === 'undefined') {
-                console.error('window.expectedSourceTypes is unexpectedly empty.')
+            // console.log(globalThis.expectedSourceTypes.destination[this.ucFirst(transaction.type)]);
+            if (typeof globalThis.expectedSourceTypes === 'undefined') {
+                console.error('globalThis.expectedSourceTypes is unexpectedly empty.')
             }
             let result = {
                 transaction_journal_id: transaction.transaction_journal_id,
@@ -529,7 +519,7 @@ export default {
                     currency_name: transaction.currency_name,
                     currency_code: transaction.currency_code,
                     currency_decimal_places: transaction.currency_decimal_places,
-                    allowed_types: window.expectedSourceTypes.source[this.ucFirst(transaction.type)]
+                    allowed_types: globalThis.expectedSourceTypes.source[this.ucFirst(transaction.type)]
                 },
                 destination_account: {
                     id: transaction.destination_id,
@@ -539,10 +529,9 @@ export default {
                     currency_name: transaction.currency_name,
                     currency_code: transaction.currency_code,
                     currency_decimal_places: transaction.currency_decimal_places,
-                    allowed_types: window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
+                    allowed_types: globalThis.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
                 }
             };
-            // console.log('Source currency id is      ' + result.source_account.currency_id);
             // console.log('Destination currency id is ' + result.destination_account.currency_id);
 
             // if transaction type is transfer, the destination currency_id etc. MUST match the actual account currency info.
@@ -555,13 +544,11 @@ export default {
                 result.destination_account.currency_name = transaction.foreign_currency_name;
                 result.destination_account.currency_code = transaction.foreign_currency_code;
                 result.destination_account.currency_decimal_places = transaction.foreign_currency_decimal_places;
-                // console.log('Set destination currency_id to ' + result.destination_account.currency_id);
             }
             // if the transaction type is a deposit, but the source account is a liability, the source
             // account currency must not be overruled.
 
             if('deposit' === transaction.type && ['Loan', 'Debt', 'Mortgage'].includes(transaction.source_type)) {
-                // console.log('Overrule for deposit from liability to ' + transaction.foreign_currency_id);
                 result.destination_account.currency_id = transaction.foreign_currency_id;
                 result.destination_account.currency_name = transaction.foreign_currency_name;
                 result.destination_account.currency_code = transaction.foreign_currency_code;
@@ -575,19 +562,16 @@ export default {
             this.transactions.push(result);
         },
         limitSourceType: function (type) {
-            // let i;
             // for (i = 0; i < this.transactions.length; i++) {
             //     this.transactions[i].source_account.allowed_types = [type];
             // }
         },
         limitDestinationType: function (type) {
-            // let i;
             // for (i = 0; i < this.transactions.length; i++) {
             //     this.transactions[i].destination_account.allowed_types = [type];
             // }
         },
         convertData: function () {
-            // console.log('start of convertData');
             let data = {
                 'apply_rules': this.applyRules,
                 'fire_webhooks': this.fireWebhooks,
@@ -610,12 +594,10 @@ export default {
             firstDestination = this.transactions[0].destination_account.type;
 
             if ('invalid' === transactionType && ['Asset account', 'Loan', 'Debt', 'Mortgage'].includes(firstSource)) {
-                //console.log('Assumed this is a withdrawal.');
                 transactionType = 'withdrawal';
             }
 
             if ('invalid' === transactionType && ['Asset account', 'Loan', 'Debt', 'Mortgage'].includes(firstDestination)) {
-                //console.log('Assumed this is a deposit.');
                 transactionType = 'deposit';
             }
 
@@ -627,17 +609,14 @@ export default {
             }
             // if transaction type is deposit BUT the source account is a liability, the currency ID must be the SOURCE account ID.
             if ('deposit' === transactionType && ['Loan', 'Debt', 'Mortgage'].includes(firstSource)) {
-                // console.log('Overruled currency ID to ' + this.transactions[0].source_account.currency_id);
                 currencyId = this.transactions[0].source_account.currency_id;
             }
-            // console.log('Final currency ID = ' + currencyId);
 
             for (let key in this.transactions) {
                 if (this.transactions.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
                     data.transactions.push(this.convertDataRow(this.transactions[key], key, transactionType, currencyId));
                 }
             }
-            //console.log(data);
             // console.log('end of convertData');
             return data;
         },
@@ -667,7 +646,6 @@ export default {
             // }
 
             row.currency_id = currencyId;
-            // console.log('Final currency ID = ' + currencyId);
 
             date = row.date;
             if (index > 0) {
@@ -676,12 +654,12 @@ export default {
 
             // if type is 'withdrawal' and destination is empty, cash withdrawal.
             if (transactionType === 'withdrawal' && '' === destName) {
-                destId = window.cashAccountId;
+                destId = globalThis.cashAccountId;
             }
 
             // if type is 'deposit' and source is empty, cash deposit.
             if (transactionType === 'deposit' && '' === sourceName) {
-                sourceId = window.cashAccountId;
+                sourceId = globalThis.cashAccountId;
             }
 
             // if index is over 0 and type is withdrawal or transfer, take source from index 0.
@@ -705,12 +683,11 @@ export default {
                 }
             }
             // set foreign currency info:
-            if (typeof row.foreign_amount.amount !== 'undefined' && row.foreign_amount.amount.toString() !== '' && parseFloat(row.foreign_amount.amount) !== .00) {
+            if (typeof row.foreign_amount.amount !== 'undefined' && row.foreign_amount.amount.toString() !== '' && Number.parseFloat(row.foreign_amount.amount) !== .00) {
                 foreignAmount = row.foreign_amount.amount;
                 foreignCurrency = row.foreign_amount.currency_id;
             }
             if (foreignCurrency === row.currency_id) {
-                // console.log('reset foreign currencyto NULL because ' + foreignCurrency + ' = ' + row.currency_id);
                 foreignAmount = null;
                 foreignCurrency = null;
             }
@@ -729,7 +706,6 @@ export default {
                 row.amount = String(row.amount).replace(',', '.');
             }
 
-            // console.log('Reconciled is ' + row.reconciled);
 
             currentArray =
                 {
@@ -772,16 +748,16 @@ export default {
             }
 
             // set budget id and piggy ID.
-            currentArray.budget_id = parseInt(row.budget);
-            if (parseInt(row.bill) > 0) {
-                currentArray.bill_id = parseInt(row.bill);
+            currentArray.budget_id = Number.parseInt(row.budget);
+            if (Number.parseInt(row.bill) > 0) {
+                currentArray.bill_id = Number.parseInt(row.bill);
             }
-            if (0 === parseInt(row.bill)) {
+            if (0 === Number.parseInt(row.bill)) {
                 currentArray.bill_id = null;
             }
 
-            if (parseInt(row.piggy_bank) > 0) {
-                currentArray.piggy_bank_id = parseInt(row.piggy_bank);
+            if (Number.parseInt(row.piggy_bank) > 0) {
+                currentArray.piggy_bank_id = Number.parseInt(row.piggy_bank);
             }
             if (this.isReconciled && !this.storeAsNew && true === row.reconciled) {
                 // drop content from array:
@@ -802,12 +778,11 @@ export default {
             return currentArray;
         },
         submit: function (e) {
-            // console.log('Submit!');
             let button = $('#submitButton');
             button.prop("disabled", true);
 
-            const page = window.location.href.split('/');
-            const groupId = parseInt(page[page.length - 1]);
+            const page = globalThis.location.href.split('/');
+            const groupId = Number.parseInt(page[page.length - 1]);
             let uri = './api/v1/transactions/' + groupId + '?_token=' + document.head.querySelector('meta[name="csrf-token"]').content;
             let method = 'PUT';
             if (this.storeAsNew) {
@@ -817,13 +792,11 @@ export default {
                 method = 'POST';
             }
             const data = this.convertData();
-            // console.log('POST!');
             axios({
                 method: method,
                 url: uri,
                 data: data,
             }).then(response => {
-                // console.log('Response!');
                 if (0 === this.collectAttachmentData(response)) {
                     const title = response.data.data.attributes.group_title ?? response.data.data.attributes.transactions[0].description;
                     this.redirectUser(response.data.data.id, title);
@@ -840,11 +813,9 @@ export default {
             if (e) {
                 e.preventDefault();
             }
-            // console.log('DONE with method.');
         },
 
         redirectUser(groupId, title) {
-            // console.log('Now in redirectUser');
             if (this.returnAfter) {
                 this.setDefaultErrors();
                 // do message if update or new:
@@ -863,16 +834,14 @@ export default {
                 }
             } else {
                 if (this.storeAsNew) {
-                    window.location.href = window.previousUrl + '?transaction_group_id=' + groupId + '&message=created';
+                    globalThis.location.href = globalThis.previousUrl + '?transaction_group_id=' + groupId + '&message=created';
                 } else {
-                    window.location.href = window.previousUrl + '?transaction_group_id=' + groupId + '&message=updated';
+                    globalThis.location.href = globalThis.previousUrl + '?transaction_group_id=' + groupId + '&message=updated';
                 }
             }
-            // console.log('End of redirectUser');
         },
 
         collectAttachmentData(response) {
-            // console.log('Now incollectAttachmentData()');
             let groupId = response.data.data.id;
 
             // array of all files to be uploaded:
@@ -904,7 +873,6 @@ export default {
                 }
             }
             let count = toBeUploaded.length;
-            // console.log('Found ' + toBeUploaded.length + ' attachments.');
 
             // loop all uploads.
             for (const key in toBeUploaded) {
@@ -930,7 +898,6 @@ export default {
                     })(toBeUploaded[key], key, this);
                 }
             }
-            // console.log('Done with collectAttachmentData()');
             return count;
         },
 
@@ -949,19 +916,16 @@ export default {
                     };
                     axios.post(uri, data)
                         .then(response => {
-                            // console.log('Created attachment #' + key);
                             // console.log('Uploading attachment #' + key);
                             const uploadUri = './api/v1/attachments/' + response.data.data.id + '/upload';
                             axios.post(uploadUri, fileData[key].content)
                                 .then(secondResponse => {
-                                    // console.log('Uploaded attachment #' + key);
                                     uploads++;
                                     if (uploads === count) {
                                         // finally we can redirect the user onwards.
                                         // console.log('FINAL UPLOAD');
                                         this.redirectUser(groupId, null);
                                     }
-                                    // console.log('Upload complete!');
                                     return true;
                                 }).catch(error => {
                                 console.error('Could not upload file.');
@@ -971,7 +935,6 @@ export default {
                                 if (uploads === count) {
                                     this.redirectUser(groupId, null);
                                 }
-                                // console.error(error);
                                 return false;
                             });
                         }).catch(error => {
@@ -983,7 +946,6 @@ export default {
                             // console.log('FINAL UPLOAD');
                             this.redirectUser(groupId, null);
                         }
-                        // console.log('Upload complete!');
                         return false;
                     });
                 }
@@ -1090,12 +1052,10 @@ export default {
             // console.log('Transactions length = ' + count);
             // also set accounts from previous entry, if present.
             if (this.transactions.length > 1) {
-                // console.log('Adding split.');
                 this.transactions[count - 1].source_account = this.transactions[count - 2].source_account;
                 this.transactions[count - 1].destination_account = this.transactions[count - 2].destination_account;
                 this.transactions[count - 1].date = this.transactions[count - 2].date;
             }
-            // console.log('Transactions length now = ' + this.transactions.length);
 
             if (e) {
                 e.preventDefault();
@@ -1119,7 +1079,7 @@ export default {
                     }
                     if (key !== 'group_title') {
                         // lol dumbest way to explode "transactions.0.something" ever.
-                        transactionIndex = parseInt(key.split('.')[1]);
+                        transactionIndex = Number.parseInt(key.split('.')[1]);
                         fieldName = key.split('.')[2];
                         // set error in this object thing.
                         switch (fieldName) {
@@ -1133,7 +1093,6 @@ export default {
                                 this.transactions[transactionIndex].errors[fieldName] = errors.errors[key];
                                 break;
                             case 'external_url':
-                                //console.log('Found ext error in field "' + fieldName + '": ' + errors.errors[key]);
                                 this.transactions[transactionIndex].errors.custom_errors[fieldName] = errors.errors[key];
                                 break;
                             case 'source_name':
diff --git a/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue b/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue
index 3f61bec9ede..93c4eb38d66 100644
--- a/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue
+++ b/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue
@@ -32,7 +32,7 @@
                 <option
                     v-for="currency in this.enabledCurrencies"
                     :label="currency.attributes.name"
-                    :selected="parseInt(value.currency_id) === parseInt(currency.id)"
+                    :selected="Number.parseInt(value.currency_id) === Number.parseInt(currency.id)"
                     :value="currency.id"
 
                 >
@@ -68,7 +68,6 @@ export default {
     props: ['source', 'destination', 'transactionType', 'value', 'error', 'no_currency', 'title',],
     mounted() {
         this.liability = false;
-        // console.log('I am mounted with a ' + this.transactionType + ' transaction type and currency id!');
         // console.log(this.value);
         this.loadCurrencies();
     },
@@ -83,15 +82,12 @@ export default {
     },
     watch: {
         source: function () {
-            // console.log('ForeignAmountSelect watch source');
             this.changeData();
         },
         destination: function () {
-            // console.log('ForeignAmountSelect watch destination');
             this.changeData();
         },
         transactionType: function () {
-            // console.log('ForeignAmountSelect watch transaction type (is now ' + this.transactionType + ')');
             this.changeData();
         }
     },
@@ -103,21 +99,17 @@ export default {
             this.$emit('clear:amount')
         },
         hasError: function () {
-            //console.log('ForeignAmountSelect hasError');
             return this.error.length > 0;
         },
         handleInput(e) {
-            // console.log('ForeignAmountSelect handleInput');
             let obj = {
                 amount: this.$refs.amount.value,
                 currency_id: this.$refs.currency_select.value,
             };
-            // console.log(obj);
             this.$emit('input', obj
             );
         },
         changeData: function () {
-            // console.log('ForeignAmountSelect changeData');
             this.enabledCurrencies = [];
             let destType = this.destination.type ? this.destination.type.toLowerCase() : 'invalid';
             let srcType = this.source.type ? this.source.type.toLowerCase() : 'invalid';
@@ -126,11 +118,9 @@ export default {
             let sourceIsLiability = liabilities.indexOf(srcType) !== -1;
             let destIsLiability = liabilities.indexOf(destType) !== -1;
 
-            // console.log(srcType + ' (source) is a liability: ' + sourceIsLiability);
             // console.log(destType + ' (dest) is a liability: ' + destIsLiability);
             // console.log('tType: ' + tType);
             if (tType === 'transfer' || destIsLiability || sourceIsLiability) {
-                // console.log('Source is liability OR dest is liability, OR transfer. Lock list on currency of destination.');
                 // console.log('Length of currencies is ' + this.currencies.length);
                 // console.log(this.currencies);
                 this.liability = true;
@@ -138,16 +128,14 @@ export default {
                 for (const key in this.currencies) {
                     if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
                         if (
-                            parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id)
+                            Number.parseInt(this.currencies[key].id) === Number.parseInt(this.destination.currency_id)
                         ) {
-                            // console.log('Enable currency!!');
                             // console.log(this.destination);
                             // console.log(this.currencies[key]);
                             this.enabledCurrencies.push(this.currencies[key]);
                         }
                     }
                 }
-                // console.log('Enabled currencies length is now ' + this.enabledCurrencies.length);
                 return;
             }
 
@@ -212,7 +200,6 @@ export default {
                 for (const key in res.data.data) {
                     if (res.data.data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
                         if (res.data.data[key].attributes.enabled) {
-                            // console.log(res.data.data[key].attributes);
                             this.currencies.push(res.data.data[key]);
                             this.enabledCurrencies.push(res.data.data[key]);
                         }
diff --git a/resources/assets/v1/src/components/transactions/GroupDescription.vue b/resources/assets/v1/src/components/transactions/GroupDescription.vue
index f5f4c02164d..4c141c328c0 100644
--- a/resources/assets/v1/src/components/transactions/GroupDescription.vue
+++ b/resources/assets/v1/src/components/transactions/GroupDescription.vue
@@ -66,7 +66,6 @@ export default {
       this.$emit('input', this.$refs.descr.value);
     },
     clearField: function () {
-      //props.value = '';
       this.name = '';
       this.$refs.descr.value = '';
       this.$emit('input', this.$refs.descr.value);
diff --git a/resources/assets/v1/src/components/transactions/PiggyBank.vue b/resources/assets/v1/src/components/transactions/PiggyBank.vue
index fd0472892f5..e5ae814a78f 100644
--- a/resources/assets/v1/src/components/transactions/PiggyBank.vue
+++ b/resources/assets/v1/src/components/transactions/PiggyBank.vue
@@ -98,7 +98,6 @@ export default {
               // add to empty one:
               tempList[0].piggies.push({name_with_balance: currentPiggy.name_with_balance, id: currentPiggy.id});
             }
-            //console.log(currentPiggy);
             this.piggies.push(res.data[key]);
           }
         }
@@ -110,7 +109,6 @@ export default {
         // final list:
 
         this.piggies = ordered;
-        // console.log(ordered);
       });
     }
   }
diff --git a/resources/assets/v1/src/components/transactions/Reconciled.vue b/resources/assets/v1/src/components/transactions/Reconciled.vue
index a8d9d52ed3a..71397823122 100644
--- a/resources/assets/v1/src/components/transactions/Reconciled.vue
+++ b/resources/assets/v1/src/components/transactions/Reconciled.vue
@@ -55,7 +55,6 @@ export default {
     },
     watch: {
         reconciled: function () {
-            // console.log('reconciled is ' + this.reconciled);
             this.$emit('input', this.reconciled);
         },
     },
diff --git a/resources/assets/v1/src/components/transactions/StandardDate.vue b/resources/assets/v1/src/components/transactions/StandardDate.vue
index ab9239d44bd..1022c63894a 100644
--- a/resources/assets/v1/src/components/transactions/StandardDate.vue
+++ b/resources/assets/v1/src/components/transactions/StandardDate.vue
@@ -64,7 +64,6 @@ export default {
       this.$emit('input', this.$refs.date.value);
     },
     clearDate: function () {
-      //props.value = '';
       this.name = '';
       this.$refs.date.value = '';
       this.$emit('input', this.$refs.date.value);
diff --git a/resources/assets/v1/src/components/transactions/Tags.vue b/resources/assets/v1/src/components/transactions/Tags.vue
index 38fd9e534b4..89b9d4b4093 100644
--- a/resources/assets/v1/src/components/transactions/Tags.vue
+++ b/resources/assets/v1/src/components/transactions/Tags.vue
@@ -74,13 +74,11 @@ export default {
   },
   methods: {
     update(newTags) {
-      // console.log('update', newTags);
       this.autocompleteItems = [];
       this.tags = newTags;
       this.$emit('input', this.tags);
     },
     clearTags() {
-      // console.log('clearTags');
       this.tags = [];
       this.$emit('input', this.tags);
 
@@ -89,7 +87,6 @@ export default {
       return this.error.length > 0;
     },
     initItems() {
-      // console.log('Now in initItems');
       if (this.tag.length < 2) {
         return;
       }
diff --git a/resources/assets/v1/src/components/transactions/TransactionDescription.vue b/resources/assets/v1/src/components/transactions/TransactionDescription.vue
index b6d7dd7ceff..1866eba5e13 100644
--- a/resources/assets/v1/src/components/transactions/TransactionDescription.vue
+++ b/resources/assets/v1/src/components/transactions/TransactionDescription.vue
@@ -128,7 +128,6 @@ export default {
       return this.error.length > 0;
     },
     clearDescription: function () {
-      //props.value = '';
       this.description = '';
       this.$refs.descr.value = '';
       this.$emit('input', this.$refs.descr.value);
@@ -142,7 +141,6 @@ export default {
     // TODO feels sloppy
 
       if (e.keyCode === 13) {
-        //e.preventDefault();
       }
     },
     selectedItem: function (e) {
diff --git a/resources/assets/v1/src/components/transactions/TransactionType.vue b/resources/assets/v1/src/components/transactions/TransactionType.vue
index f49bdea9e5a..461df08580c 100644
--- a/resources/assets/v1/src/components/transactions/TransactionType.vue
+++ b/resources/assets/v1/src/components/transactions/TransactionType.vue
@@ -41,9 +41,9 @@ export default {
     changeValue: function () {
       if (this.source && this.destination) {
         let transactionType = '';
-        if (window.accountToTypes[this.source]) {
-          if (window.accountToTypes[this.source][this.destination]) {
-            transactionType = window.accountToTypes[this.source][this.destination];
+        if (globalThis.accountToTypes[this.source]) {
+          if (globalThis.accountToTypes[this.source][this.destination]) {
+            transactionType = globalThis.accountToTypes[this.source][this.destination];
           } else {
             console.warn('User selected an impossible destination.');
           }
diff --git a/resources/assets/v1/src/components/webhooks/Create.vue b/resources/assets/v1/src/components/webhooks/Create.vue
index cf39a693dfa..7905d9ad26c 100644
--- a/resources/assets/v1/src/components/webhooks/Create.vue
+++ b/resources/assets/v1/src/components/webhooks/Create.vue
@@ -140,12 +140,10 @@ export default {
 
       // post!
       axios.post('./api/v1/webhooks', data).then((response) => {
-        //this.success_message = $.text(response.data.message);
         // console.log('Will now go to redirectUser()');
         let webhookId = response.data.data.id;
-        window.location.href = window.previousUrl + '?webhook_id=' + webhookId + '&message=created';
+        globalThis.location.href = globalThis.previousUrl + '?webhook_id=' + webhookId + '&message=created';
       }).catch((error) => {
-        //console.log(error.response.data);
         this.error_message = error.response.data.message;
         this.errors.title = error.response.data.errors.title;
         this.errors.trigger = error.response.data.errors.trigger;
diff --git a/resources/assets/v1/src/components/webhooks/Edit.vue b/resources/assets/v1/src/components/webhooks/Edit.vue
index 52121d0abd4..45a46ef6b70 100644
--- a/resources/assets/v1/src/components/webhooks/Edit.vue
+++ b/resources/assets/v1/src/components/webhooks/Edit.vue
@@ -118,15 +118,14 @@ export default {
   },
   methods: {
     getWebhook: function () {
-      const page = window.location.href.split('/');
-      const webhookId = parseInt(page[page.length - 1]);
+      const page = globalThis.location.href.split('/');
+      const webhookId = Number.parseInt(page[page.length - 1]);
       this.downloadWebhook(webhookId);
     },
     downloadWebhook: function (id) {
       axios.get('./api/v1/webhooks/' + id).then(response => {
-        // console.log(response.data.data.attributes);
         this.title = response.data.data.attributes.title;
-        this.id = parseInt(response.data.data.id);
+        this.id = Number.parseInt(response.data.data.id);
 
         // trigger value on content
         console.log('Trigger is ' + response.data.data.attributes.trigger);
@@ -204,8 +203,8 @@ export default {
 
       // post!
       axios.put('./api/v1/webhooks/' + this.id, data).then((response) => {
-        let webhookId = parseInt(response.data.data.id);
-        window.location.href = window.previousUrl + '?webhook_id=' + webhookId + '&message=updated';
+        let webhookId = Number.parseInt(response.data.data.id);
+        globalThis.location.href = globalThis.previousUrl + '?webhook_id=' + webhookId + '&message=updated';
       }).catch((error) => {
 
         this.error_message = error.response.data.message;
diff --git a/resources/assets/v1/src/components/webhooks/Show.vue b/resources/assets/v1/src/components/webhooks/Show.vue
index c0ea77431b6..883d862a3d8 100644
--- a/resources/assets/v1/src/components/webhooks/Show.vue
+++ b/resources/assets/v1/src/components/webhooks/Show.vue
@@ -276,8 +276,8 @@ export default {
   methods: {
     getWebhook() {
       this.loading = true;
-      const page = window.location.href.split('/');
-      this.id = parseInt(page[page.length - 1]);
+      const page = globalThis.location.href.split('/');
+      this.id = Number.parseInt(page[page.length - 1]);
       this.downloadWebhook();
       this.downloadWebhookMessages();
     },
@@ -288,9 +288,8 @@ export default {
       if (e) {
         e.preventDefault();
       }
-      let journalId = parseInt(prompt('Enter a transaction ID'));
+      let journalId = Number.parseInt(prompt('Enter a transaction ID'));
       if (journalId !== null && journalId > 0 && journalId <= 16777216) {
-        // console.log('OK 1');
         this.disabledTrigger = true;
         // disable button. Add informative message.
         //let button = $('#triggerButton');
@@ -299,7 +298,6 @@ export default {
         this.success_message = this.$t('firefly.webhook_was_triggered');
         // TODO actually trigger the webhook.
         axios.post('./api/v1/webhooks/' + this.id + '/trigger-transaction/' + journalId, {});
-        //button.prop('disabled', false).removeClass('disabled');
         // console.log('OK 2');
 
         // set a time-outs.
@@ -308,7 +306,6 @@ export default {
           this.getWebhook();
           this.disabledTrigger = false;
         }, 2000);
-        // console.log('OK 3');
       }
 
 
@@ -363,7 +360,6 @@ export default {
     },
     downloadWebhook: function () {
       axios.get('./api/v1/webhooks/' + this.id).then(response => {
-        // console.log(response.data.data.attributes);
         this.edit_url = './webhooks/edit/' + this.id;
         this.delete_url = './webhooks/delete/' + this.id;
         this.title = response.data.data.attributes.title;
diff --git a/resources/assets/v2/src/api/v1/model/account/get.js b/resources/assets/v2/src/api/v1/model/account/get.js
index 8d8b8aed5bc..f9e61957fca 100644
--- a/resources/assets/v2/src/api/v1/model/account/get.js
+++ b/resources/assets/v2/src/api/v1/model/account/get.js
@@ -47,8 +47,8 @@ export default class Get {
         // first, check API in some consistent manner.
         // then, load if necessary.
         const cacheKey = getCacheKey('/api/v1/accounts', params);
-        const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(cacheKey);
+        const cacheValid = globalThis.store.get('cacheValid');
+        let cachedData = globalThis.store.get(cacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             console.log('Cache is valid, return cache.');
@@ -59,7 +59,7 @@ export default class Get {
 
         return api.get('/api/v1/accounts', {params: params}).then(response => {
             console.log('Cache is invalid, return fresh.');
-            window.store.set(cacheKey, response.data);
+            globalThis.store.set(cacheKey, response.data);
             return Promise.resolve({data: response.data.data, meta: response.data.meta});
         });
     }
diff --git a/resources/assets/v2/src/api/v1/model/transaction/put.js b/resources/assets/v2/src/api/v1/model/transaction/put.js
index ad38c699e7a..aa02d50cfcf 100644
--- a/resources/assets/v2/src/api/v1/model/transaction/put.js
+++ b/resources/assets/v2/src/api/v1/model/transaction/put.js
@@ -22,7 +22,7 @@ import {api} from "../../../../boot/axios";
 
 export default class Put {
     put(submission, params) {
-        let url = '/api/v1/transactions/' + parseInt(params.id);
+        let url = '/api/v1/transactions/' + Number.parseInt(params.id);
         return api.put(url, submission);
     }
 }
diff --git a/resources/assets/v2/src/api/v1/model/user-group/put.js b/resources/assets/v2/src/api/v1/model/user-group/put.js
index 0cf4b978638..fa1a24e2958 100644
--- a/resources/assets/v2/src/api/v1/model/user-group/put.js
+++ b/resources/assets/v2/src/api/v1/model/user-group/put.js
@@ -22,7 +22,7 @@ import {api} from "../../../../boot/axios";
 
 export default class Put {
     put(submission, params) {
-        let url = '/api/v1/user-groups/' + parseInt(params.id);
+        let url = '/api/v1/user-groups/' + Number.parseInt(params.id);
         return api.put(url, submission);
     }
 }
diff --git a/resources/assets/v2/src/api/v2/model/account/get.js b/resources/assets/v2/src/api/v2/model/account/get.js
index 2655ae6a8e2..f791a63c44b 100644
--- a/resources/assets/v2/src/api/v2/model/account/get.js
+++ b/resources/assets/v2/src/api/v2/model/account/get.js
@@ -43,8 +43,8 @@ export default class Get {
         // first, check API in some consistent manner.
         // then, load if necessary.
         const cacheKey = getCacheKey('/api/v1/accounts', params);
-        const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(cacheKey);
+        const cacheValid = globalThis.store.get('cacheValid');
+        let cachedData = globalThis.store.get(cacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             console.log('Cache is valid, return cache.');
@@ -55,7 +55,7 @@ export default class Get {
 
         return api.get('/api/v1/accounts', {params: params}).then(response => {
             console.log('Cache is invalid, return fresh.');
-            window.store.set(cacheKey, response.data);
+            globalThis.store.set(cacheKey, response.data);
             return Promise.resolve({data: response.data.data, meta: response.data.meta});
         });
     }
diff --git a/resources/assets/v2/src/api/v2/model/transaction/put.js b/resources/assets/v2/src/api/v2/model/transaction/put.js
index ad38c699e7a..aa02d50cfcf 100644
--- a/resources/assets/v2/src/api/v2/model/transaction/put.js
+++ b/resources/assets/v2/src/api/v2/model/transaction/put.js
@@ -22,7 +22,7 @@ import {api} from "../../../../boot/axios";
 
 export default class Put {
     put(submission, params) {
-        let url = '/api/v1/transactions/' + parseInt(params.id);
+        let url = '/api/v1/transactions/' + Number.parseInt(params.id);
         return api.put(url, submission);
     }
 }
diff --git a/resources/assets/v2/src/api/v2/model/user-group/put.js b/resources/assets/v2/src/api/v2/model/user-group/put.js
index 0cf4b978638..fa1a24e2958 100644
--- a/resources/assets/v2/src/api/v2/model/user-group/put.js
+++ b/resources/assets/v2/src/api/v2/model/user-group/put.js
@@ -22,7 +22,7 @@ import {api} from "../../../../boot/axios";
 
 export default class Put {
     put(submission, params) {
-        let url = '/api/v1/user-groups/' + parseInt(params.id);
+        let url = '/api/v1/user-groups/' + Number.parseInt(params.id);
         return api.put(url, submission);
     }
 }
diff --git a/resources/assets/v2/src/boot/bootstrap.js b/resources/assets/v2/src/boot/bootstrap.js
index 1c9fc67b35a..800988c5ebd 100644
--- a/resources/assets/v2/src/boot/bootstrap.js
+++ b/resources/assets/v2/src/boot/bootstrap.js
@@ -40,9 +40,9 @@ import adminlte from 'admin-lte';
 
 store.addPlugin(observePlugin);
 
-window.bootstrapped = false;
-window.store = store;
-window.bootstrap = bootstrap;
+globalThis.bootstrapped = false;
+globalThis.store = store;
+globalThis.bootstrap = bootstrap;
 
 
 
@@ -72,19 +72,19 @@ getFreshVariable('lastActivity').then((serverValue) => {
             store.set('end', range.end);
         }
 
-        // save local in window.__ something
-        window.__localeId__ = values[2];
+        // save local in globalThis.__ something
+        globalThis.__localeId__ = values[2];
         store.set('language', values[3]);
         store.set('locale', values[3]);
         loadTranslations(values[3]).then(() => {
             const event = new Event('firefly-iii-bootstrapped');
             document.dispatchEvent(event);
-            window.bootstrapped = true;
+            globalThis.bootstrapped = true;
         });
     });
 }).catch((error) => {
     console.error('Error while bootstrapping: ' + error);
 });
-window.axios = axios;
-window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
-window.Alpine = Alpine
+globalThis.axios = axios;
+globalThis.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+globalThis.Alpine = Alpine
diff --git a/resources/assets/v2/src/libraries/dark-editable/Types/BaseType.js b/resources/assets/v2/src/libraries/dark-editable/Types/BaseType.js
index 1c3bc35e715..db3254d18d6 100644
--- a/resources/assets/v2/src/libraries/dark-editable/Types/BaseType.js
+++ b/resources/assets/v2/src/libraries/dark-editable/Types/BaseType.js
@@ -64,7 +64,6 @@ export default class BaseType {
         // append bottom and top div to form:
         this.form.append(topDiv, bottomDiv);
 
-        //this.form.append(element, this.load, this.buttons.success, this.buttons.cancel);
         //this.form.append(element, this.load, this.buttonGroup);
         div.append(this.error, this.form);
         return div;
@@ -88,7 +87,6 @@ export default class BaseType {
 
         const form = document.createElement(`form`);
         form.classList.add("row", "row-cols-lg-auto", "g-3", "align-items-center");
-        //form.style.gap = "20px";
         form.addEventListener('submit', async e => {
             e.preventDefault();
             const newValue = this.getValue();
@@ -182,7 +180,6 @@ export default class BaseType {
 
     ajax(new_value) {
         let url = this.context.url;
-        //const form = new FormData;
         let message;
         let submit = false;
 
@@ -204,9 +201,7 @@ export default class BaseType {
             console.error('Cannot deal with form type "'+this.context.formType+'"');
         }
 
-        // form.append("pk", this.context.pk);
 
-        // form.append("name", this.context.name);
         // form.append("value", new_value);
 
         const option = {
diff --git a/resources/assets/v2/src/pages/accounts/index.js b/resources/assets/v2/src/pages/accounts/index.js
index 109f7d14d49..d67621ef954 100644
--- a/resources/assets/v2/src/pages/accounts/index.js
+++ b/resources/assets/v2/src/pages/accounts/index.js
@@ -35,7 +35,7 @@ import pageNavigation from "../../support/page-navigation.js";
 
 
 // set type from URL
-const beforeQuery = window.location.href.split('?');
+const beforeQuery = globalThis.location.href.split('?');
 const urlParts = beforeQuery[0].split('/');
 const type = urlParts[urlParts.length - 1];
 
@@ -44,7 +44,7 @@ let sortDirection = '';
 let page = 1;
 
 // get sort parameters
-const params = new Proxy(new URLSearchParams(window.location.search), {
+const params = new Proxy(new URLSearchParams(globalThis.location.search), {
     get: (searchParams, prop) => searchParams.get(prop),
 });
 sortingColumn = params.column ?? '';
@@ -54,7 +54,7 @@ if(sortingColumn[0] === '-') {
     sortDirection = 'desc';
 }
 
-page = parseInt(params.page ?? 1);
+page = Number.parseInt(params.page ?? 1);
 
 
 showInternalsButton();
@@ -161,7 +161,7 @@ let index = function () {
             setVariable(this.getPreferenceKey('filters'), this.filters);
 
             // hide modal
-            window.bootstrap.Modal.getInstance(document.getElementById('filterModal')).hide();
+            globalThis.bootstrap.Modal.getInstance(document.getElementById('filterModal')).hide();
             this.loadAccounts();
         },
         saveGroupedAccounts() {
@@ -210,7 +210,7 @@ let index = function () {
         updatePageUrl() {
             this.pageUrl = this.generatePageUrl(true);
 
-            window.history.pushState({}, "", this.pageUrl);
+            globalThis.history.pushState({}, "", this.pageUrl);
         },
         generatePageUrl(includePageNr) {
             let url = './accounts/' + type + '?column=' + this.pageOptions.sortingColumn + '&direction=' + this.pageOptions.sortDirection + '&page=';
@@ -315,7 +315,6 @@ let index = function () {
             // need to find the input thing
             console.log('Clicked edit button for account on index #' + index + ' and field ' + fieldName);
             const querySelector = 'input[data-field="' + fieldName + '"][data-index="' + index + '"]';
-            // console.log(querySelector);
             const newValue = document.querySelectorAll(querySelector)[0].value ?? '';
             if ('' === newValue) {
                 return;
@@ -348,7 +347,6 @@ let index = function () {
             if('asc' === this.pageOptions.sortDirection && '' !== sorting) {
                 sorting = '-' + sorting;
             }
-            //const sorting = [{column: this.pageOptions.sortingColumn, direction: this.pageOptions.sortDirection}];
 
             // filter instructions
             let filters = {};
@@ -357,14 +355,13 @@ let index = function () {
             for (let k in this.filters) {
                 if (this.filters.hasOwnProperty(k) && null !== this.filters[k]) {
                     filters[k] = this.filters[k];
-                    //filters.push({column: k, filter: this.filters[k]});
                 }
             }
             delete filters.type;
 
             // get start and end from the store:
-            const start = new Date(window.store.get('start'));
-            const end = new Date(window.store.get('end'));
+            const start = new Date(globalThis.store.get('start'));
+            const end = new Date(globalThis.store.get('end'));
             const today = new Date();
 
             let params = {
@@ -391,7 +388,7 @@ let index = function () {
                     if (response.data.hasOwnProperty(i)) {
                         let current = response.data[i];
                         let account = {
-                            id: parseInt(current.id),
+                            id: Number.parseInt(current.id),
                             active: current.attributes.active,
                             name: current.attributes.name,
                             nameEditorVisible: false,
@@ -418,7 +415,7 @@ let index = function () {
                         if (!groupedAccounts.hasOwnProperty(groupId)) {
                             groupedAccounts[groupId] = {
                                 group: {
-                                    id: '0' === groupId || null === groupId ? null : parseInt(groupId),
+                                    id: '0' === groupId || null === groupId ? null : Number.parseInt(groupId),
                                     title: current.attributes.object_group_title, // are ignored if group id is null.
                                     order: current.attributes.object_group_order,
                                 },
@@ -427,7 +424,6 @@ let index = function () {
                         }
                         groupedAccounts[groupId].accounts.push(account);
 
-                        //this.accounts.push(account);
                     }
                 }
                 // order grouped accounts by order.
@@ -471,7 +467,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/pages/administrations/create.js b/resources/assets/v2/src/pages/administrations/create.js
index ef0ccd6231f..69d555f18c4 100644
--- a/resources/assets/v2/src/pages/administrations/create.js
+++ b/resources/assets/v2/src/pages/administrations/create.js
@@ -71,7 +71,7 @@ let administrations = function () {
                     this.title = '';
                 }
                 if (!this.formStates.returnHereButton) {
-                    window.location.href = './administrations?user_group_id=' + parseInt(response.data.data.id) + '&message=created';
+                    globalThis.location.href = './administrations?user_group_id=' + Number.parseInt(response.data.data.id) + '&message=created';
                 }
             }).catch(error => {
                 this.errors.title = error.response.data.errors.title;
@@ -79,7 +79,7 @@ let administrations = function () {
 
         },
         cancelForm() {
-            window.location.href = './administrations';
+            globalThis.location.href = './administrations';
         },
         init() {
 
@@ -105,7 +105,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/pages/administrations/edit.js b/resources/assets/v2/src/pages/administrations/edit.js
index 5237b770cd8..5d6ead0699c 100644
--- a/resources/assets/v2/src/pages/administrations/edit.js
+++ b/resources/assets/v2/src/pages/administrations/edit.js
@@ -75,7 +75,7 @@ let administrations = function () {
                 }
                 if (!this.formStates.returnHereButton) {
                     // TODO needs a better redirect.
-                    window.location.href = './administrations?user_group_id=' + parseInt(response.data.data.id) + '&message=updated';
+                    globalThis.location.href = './administrations?user_group_id=' + Number.parseInt(response.data.data.id) + '&message=updated';
                 }
             }).catch(error => {
                 this.errors.title = error.response.data.errors.title;
@@ -83,14 +83,14 @@ let administrations = function () {
 
         },
         cancelForm() {
-            window.location.href = './administrations';
+            globalThis.location.href = './administrations';
         },
         init() {
-            const page = window.location.href.split('/');
-            const groupId = parseInt(page[page.length - 1]);
+            const page = globalThis.location.href.split('/');
+            const groupId = Number.parseInt(page[page.length - 1]);
             (new Get()).show(groupId, {}).then(response => {
                 this.title = response.data.data.attributes.title;
-                this.id = parseInt(response.data.data.id);
+                this.id = Number.parseInt(response.data.data.id);
             });
         }
     }
@@ -114,7 +114,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/pages/administrations/index.js b/resources/assets/v2/src/pages/administrations/index.js
index bae286d55aa..f13db048052 100644
--- a/resources/assets/v2/src/pages/administrations/index.js
+++ b/resources/assets/v2/src/pages/administrations/index.js
@@ -53,7 +53,7 @@ let index = function () {
             this.loadAdministrations();
         },
         useAdministration(id) {
-            let groupId = parseInt(id);
+            let groupId = Number.parseInt(id);
             // try to post "use", then reload administrations.
             (new Post()).use(groupId).then(response => {
                this.loadAdministrations();
@@ -70,7 +70,7 @@ let index = function () {
                     if (response.data.data.hasOwnProperty(i)) {
                         let current = response.data.data[i];
                         let group = {
-                            id: parseInt(current.id),
+                            id: Number.parseInt(current.id),
                             title: current.attributes.title,
                             in_use: current.attributes.in_use,
                             owner: '',
@@ -134,7 +134,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/pages/dashboard/accounts.js b/resources/assets/v2/src/pages/dashboard/accounts.js
index 5aab5eba4df..6b3d383f260 100644
--- a/resources/assets/v2/src/pages/dashboard/accounts.js
+++ b/resources/assets/v2/src/pages/dashboard/accounts.js
@@ -58,12 +58,12 @@ export default () => ({
 
 
     getFreshData() {
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start = new Date(globalThis.store.get('start'));
+        const end = new Date(globalThis.store.get('end'));
         const chartCacheKey = getCacheKey(this.localCacheKey('chart'), {convertToPrimary: this.convertToPrimary, start: start, end: end})
 
-        const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(chartCacheKey);
+        const cacheValid = globalThis.store.get('cacheValid');
+        let cachedData = globalThis.store.get(chartCacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             console.log('Generate from cache: ', chartCacheKey);
@@ -75,7 +75,7 @@ export default () => ({
         dashboard.dashboard(start, end, null).then((response) => {
             this.chartData = response.data;
             // cache generated options:
-            window.store.set(chartCacheKey, response.data);
+            globalThis.store.set(chartCacheKey, response.data);
             console.log('Generate FRESH!');
             this.drawChart(this.generateOptions(this.chartData));
             this.loading = false;
@@ -137,7 +137,7 @@ export default () => ({
                     options.options.scales[code] = {
                         id: currency,
                         type: 'linear',
-                        position: 1 === parseInt(currency) ? 'right' : 'left',
+                        position: 1 === Number.parseInt(currency) ? 'right' : 'left',
                         ticks: {
                             callback: function (value, index, values) {
                                 return formatMoney(value, currencies[currency]);
@@ -182,12 +182,12 @@ export default () => ({
             this.loadingAccounts = false;
             return;
         }
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start = new Date(globalThis.store.get('start'));
+        const end = new Date(globalThis.store.get('end'));
         const accountCacheKey = getCacheKey(this.localCacheKey('data'), {start: start, end: end});
 
-        const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(accountCacheKey);
+        const cacheValid = globalThis.store.get('cacheValid');
+        let cachedData = globalThis.store.get(accountCacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             this.accountList = cachedData;
@@ -195,20 +195,18 @@ export default () => ({
             return;
         }
 
-        // console.log('loadAccounts continue!');
         const max = 10;
         let totalAccounts = 0;
         let count = 0;
         let accounts = [];
         Promise.all([getVariable('frontpageAccounts'),]).then((values) => {
             totalAccounts = values[0].length;
-            //console.log(values[0]);
             for (let i in values[0]) {
                 let account = values[0];
                 if (account.hasOwnProperty(i)) {
                     let accountId = account[i];
                     // grab account info for box:
-                    (new Get).show(accountId, new Date(window.store.get('end'))).then((response) => {
+                    (new Get).show(accountId, new Date(globalThis.store.get('end'))).then((response) => {
                         let parent = response.data.data;
 
                         // apply function to each element of parent:
@@ -222,8 +220,8 @@ export default () => ({
                         // get groups for account:
                         const params = {
                             page: 1,
-                            start: new Date(window.store.get('start')),
-                            end: new Date(window.store.get('end')),
+                            start: new Date(globalThis.store.get('start')),
+                            end: new Date(globalThis.store.get('end')),
                         };
                         (new Get).transactions(parent.id, params).then((response) => {
                             let groups = [];
@@ -239,11 +237,10 @@ export default () => ({
                                 };
                                 for (let iii = 0; iii < current.attributes.transactions.length; iii++) {
                                     let currentTransaction = current.attributes.transactions[iii];
-                                    //console.log(currentTransaction);
-                                    let amountRaw = 'withdrawal' === currentTransaction.type ? parseFloat(currentTransaction.amount) * -1 : parseFloat(currentTransaction.amount);
+                                    let amountRaw = 'withdrawal' === currentTransaction.type ? Number.parseFloat(currentTransaction.amount) * -1 : Number.parseFloat(currentTransaction.amount);
 
                                     // if transfer and source is this account, multiply again
-                                    if('transfer' === currentTransaction.type && parseInt(currentTransaction.source_id) === accountId) { //
+                                    if('transfer' === currentTransaction.type && Number.parseInt(currentTransaction.source_id) === accountId) { //
                                         amountRaw = amountRaw * -1;
                                     }
 
@@ -257,7 +254,6 @@ export default () => ({
                                 }
                                 groups.push(group);
                             }
-                            // console.log(parent);
                             accounts.push({
                                 name: parent.attributes.name,
                                 order: parent.attributes.order,
@@ -265,56 +261,49 @@ export default () => ({
                                 balances: parent.attributes.balances,
                                 groups: groups,
                             });
-                            // console.log(parent.attributes);
                             count++;
                             if (count === totalAccounts) {
                                 accounts.sort((a, b) => a.order - b.order); // b - a for reverse sort
 
                                 this.accountList = accounts;
                                 this.loadingAccounts = false;
-                                window.store.set(accountCacheKey, accounts);
+                                globalThis.store.set(accountCacheKey, accounts);
                             }
                         });
                     });
                 }
             }
-            //this.loadingAccounts = false;
         });
     },
 
     init() {
-        // console.log('accounts init');
         Promise.all([
             getVariable('viewRange', '1M'), // 0
             getVariable('convert_to_primary', false), // 1
             getVariable('language', 'en_US'), // 2
             getConfiguration('cer.enabled', false) // 3
         ]).then((values) => {
-            //console.log('accounts after promises');
             this.convertToPrimary = values[1] && values[3];
             afterPromises = true;
-            //console.log('convertToPrimary in accounts.js: ', values);
 
             // main dashboard chart:
             this.loadChart();
             this.loadAccounts();
         });
-        window.store.observe('end', () => {
+        globalThis.store.observe('end', () => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('accounts observe end');
             chartData = null;
             this.accountList = [];
             // main dashboard chart:
             this.loadChart();
             this.loadAccounts();
         });
-        window.store.observe('convert_to_primary', () => {
+        globalThis.store.observe('convert_to_primary', () => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('accounts observe convertToPrimary');
             this.loadChart();
             this.loadAccounts();
         });
diff --git a/resources/assets/v2/src/pages/dashboard/boxes.js b/resources/assets/v2/src/pages/dashboard/boxes.js
index ef2391f386b..b1d9b0aa7bf 100644
--- a/resources/assets/v2/src/pages/dashboard/boxes.js
+++ b/resources/assets/v2/src/pages/dashboard/boxes.js
@@ -46,14 +46,13 @@ export default () => ({
     },
 
     getFreshData() {
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start = new Date(globalThis.store.get('start'));
+        const end = new Date(globalThis.store.get('end'));
         // TODO cache key is hard coded, problem?
         const boxesCacheKey = getCacheKey('ds_boxes_data', {convertToPrimary: this.convertToPrimary, start: start, end: end});
         cleanupCache();
 
-        //const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(boxesCacheKey);
+        let cachedData = globalThis.store.get(boxesCacheKey);
         const cacheValid = false; // force refresh
 
         if (cacheValid && typeof cachedData !== 'undefined') {
@@ -67,7 +66,7 @@ export default () => ({
         let getter = new Summary();
         getter.get(format(start, 'yyyy-MM-dd'), format(end, 'yyyy-MM-dd'), null).then((response) => {
             this.boxData = response.data;
-            window.store.set(boxesCacheKey, response.data);
+            globalThis.store.set(boxesCacheKey, response.data);
             this.generateOptions(this.boxData);
         });
     },
@@ -86,7 +85,6 @@ export default () => ({
                     continue;
                 }
                 let key = current.key;
-                // console.log('NOT PRIMARY CURRENCY');
                 if (key.startsWith('balance-in-')) {
                     this.balanceBox.amounts.push(formatMoney(current.monetary_value, current.currency_code));
                     continue;
@@ -164,24 +162,21 @@ export default () => ({
         // console.log('boxes init');
         // TODO can be replaced by "getVariables"
         Promise.all([getVariable('viewRange'), getVariable('convert_to_primary', false)]).then((values) => {
-            // console.log('boxes after promises');
             afterPromises = true;
             this.convertToPrimary = values[1];
             this.loadBoxes();
         });
-        window.store.observe('end', () => {
+        globalThis.store.observe('end', () => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('boxes observe end');
             this.boxData = null;
             this.loadBoxes();
         });
-        window.store.observe('convert_to_primary', (newValue) => {
+        globalThis.store.observe('convert_to_primary', (newValue) => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('boxes observe convertToPrimary');
             this.convertToPrimary = newValue;
             this.loadBoxes();
         });
diff --git a/resources/assets/v2/src/pages/dashboard/budgets.js b/resources/assets/v2/src/pages/dashboard/budgets.js
index 34d33d5bc99..c1e6f8f780e 100644
--- a/resources/assets/v2/src/pages/dashboard/budgets.js
+++ b/resources/assets/v2/src/pages/dashboard/budgets.js
@@ -67,12 +67,11 @@ export default () => ({
         chart = new Chart(document.querySelector("#budget-chart"), options);
     },
     getFreshData() {
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start = new Date(globalThis.store.get('start'));
+        const end = new Date(globalThis.store.get('end'));
         const cacheKey = getCacheKey('ds_bdg_chart', {convertToPrimary: this.convertToPrimary, start: start, end: end});
-        //const cacheValid = window.store.get('cacheValid');
         const cacheValid = false;
-        let cachedData = window.store.get(cacheKey);
+        let cachedData = globalThis.store.get(cacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             chartData = cachedData; // save chart data for later.
@@ -85,14 +84,14 @@ export default () => ({
         dashboard.dashboard(start, end, null).then((response) => {
             chartData = response.data; // save chart data for later.
             this.drawChart(this.generateOptions(chartData));
-            window.store.set(cacheKey, chartData);
+            globalThis.store.set(cacheKey, chartData);
             this.loading = false;
         });
     },
     generateOptions(data) {
         currencies = [];
         let options = getDefaultChartSettings('bar');
-        options.options.locale = window.store.get('locale').replace('_', '-');
+        options.options.locale = globalThis.store.get('locale').replace('_', '-');
         options.options.plugins = {
             tooltip: {
                 callbacks: {
@@ -136,16 +135,15 @@ export default () => ({
                 //         // convert to EUR yes no?
                 let label = current.label + ' (' + current.currency_code + ')';
                 options.data.labels.push(label);
-                // label = current.label + ' (' + current.currency_code + ') b';
                 // options.data.labels.push(label);
 
                 currencies.push(current.currency_code);
                 // series 0: budgeted
-                options.data.datasets[0].data.push(parseFloat(current.entries.budgeted));
+                options.data.datasets[0].data.push(Number.parseFloat(current.entries.budgeted));
                 // series 1: spent
-                options.data.datasets[1].data.push(parseFloat(current.entries.spent) * -1);
+                options.data.datasets[1].data.push(Number.parseFloat(current.entries.spent) * -1);
                 // series 2: overspent
-                // options.data.datasets[2].data.push(parseFloat(current.entries.overspent));
+                // options.data.datasets[2].data.push(Number.parseFloat(current.entries.overspent));
             }
         }
         // the currency format callback for the Y axis is AlWAYS based on whatever the first currency is.
@@ -174,21 +172,19 @@ export default () => ({
                 this.loadChart();
             }
         });
-        window.store.observe('end', () => {
+        globalThis.store.observe('end', () => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('boxes observe end');
             if (false === this.loading) {
                 chartData = null;
                 this.loadChart();
             }
         });
-        window.store.observe('convert_to_primary', (newValue) => {
+        globalThis.store.observe('convert_to_primary', (newValue) => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('boxes observe convertToPrimary');
             this.convertToPrimary = newValue;
             if (false === this.loading) {
                 this.loadChart();
diff --git a/resources/assets/v2/src/pages/dashboard/categories.js b/resources/assets/v2/src/pages/dashboard/categories.js
index d75da3acfbc..047479e84dd 100644
--- a/resources/assets/v2/src/pages/dashboard/categories.js
+++ b/resources/assets/v2/src/pages/dashboard/categories.js
@@ -78,7 +78,7 @@ export default () => ({
                         let amount = 0.0;
                         if (code === ii) {
                             // this series' currency matches this column's currency.
-                            amount = parseFloat(current.amount);
+                            amount = Number.parseFloat(current.amount);
                             yAxis = 'y' + current.currency_code;
                         }
                         if (series[ii].data.hasOwnProperty(current.label)) {
@@ -103,7 +103,6 @@ export default () => ({
         // loop the series and create ChartJS-compatible data sets.
         let count = 0;
         for (const i in series) {
-            // console.log('series');
             let yAxisID = 'y' + i;
             let dataset = {
                 label: i,
@@ -144,12 +143,12 @@ export default () => ({
 
     },
     getFreshData() {
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start = new Date(globalThis.store.get('start'));
+        const end = new Date(globalThis.store.get('end'));
         const cacheKey = getCacheKey('ds_ct_chart', {convertToPrimary: this.convertToPrimary, start: start, end: end});
 
-        const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(cacheKey);
+        const cacheValid = globalThis.store.get('cacheValid');
+        let cachedData = globalThis.store.get(cacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             chartData = cachedData; // save chart data for later.
@@ -162,7 +161,7 @@ export default () => ({
         dashboard.dashboard(start, end, null).then((response) => {
             chartData = response.data; // save chart data for later.
             this.drawChart(this.generateOptions(response.data));
-            window.store.set(cacheKey, chartData);
+            globalThis.store.set(cacheKey, chartData);
             this.loading = false;
         });
     },
@@ -181,20 +180,19 @@ export default () => ({
         this.getFreshData();
     },
     init() {
-        // console.log('categories init');
         Promise.all([getVariable('convert_to_primary', false),]).then((values) => {
             this.convertToPrimary = values[0];
             afterPromises = true;
             this.loadChart();
         });
-        window.store.observe('end', () => {
+        globalThis.store.observe('end', () => {
             if (!afterPromises) {
                 return;
             }
             this.chartData = null;
             this.loadChart();
         });
-        window.store.observe('convert_to_primary', (newValue) => {
+        globalThis.store.observe('convert_to_primary', (newValue) => {
             if (!afterPromises) {
                 return;
             }
diff --git a/resources/assets/v2/src/pages/dashboard/dashboard.js b/resources/assets/v2/src/pages/dashboard/dashboard.js
index fd032e97a19..43e3d288110 100644
--- a/resources/assets/v2/src/pages/dashboard/dashboard.js
+++ b/resources/assets/v2/src/pages/dashboard/dashboard.js
@@ -99,7 +99,6 @@ const comps = {
 
 showInternalsButton();
 
-//let i18n;
 
 function loadPage(comps) {
     Object.keys(comps).forEach(comp => {
@@ -115,7 +114,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage(comps);
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage(comps);
 }
diff --git a/resources/assets/v2/src/pages/dashboard/piggies.js b/resources/assets/v2/src/pages/dashboard/piggies.js
index 25c9fa60e16..853a84d3170 100644
--- a/resources/assets/v2/src/pages/dashboard/piggies.js
+++ b/resources/assets/v2/src/pages/dashboard/piggies.js
@@ -33,13 +33,13 @@ export default () => ({
     sankeyGrouping: 'account',
     piggies: [],
     getFreshData() {
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start = new Date(globalThis.store.get('start'));
+        const end = new Date(globalThis.store.get('end'));
         // needs user data.
         const cacheKey = getCacheKey(PIGGY_CACHE_KEY, {convertToPrimary: this.convertToPrimary, start: start, end: end});
 
-        const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(cacheKey);
+        const cacheValid = globalThis.store.get('cacheValid');
+        let cachedData = globalThis.store.get(cacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             apiData = cachedData;
@@ -56,18 +56,18 @@ export default () => ({
         this.downloadPiggyBanks(params);
     },
     downloadPiggyBanks(params) {
-        const start = new Date(window.store.get('start'));
-        const end = new Date(window.store.get('end'));
+        const start = new Date(globalThis.store.get('start'));
+        const end = new Date(globalThis.store.get('end'));
         const cacheKey = getCacheKey(PIGGY_CACHE_KEY, {start: start, end: end});
         const getter = new Get();
         getter.list(params).then((response) => {
             apiData = [...apiData, ...response.data.data];
-            if (parseInt(response.data.meta.pagination.total_pages) > params.page) {
+            if (Number.parseInt(response.data.meta.pagination.total_pages) > params.page) {
                 params.page++;
                 this.downloadPiggyBanks(params);
                 return;
             }
-            window.store.set(cacheKey, apiData);
+            globalThis.store.set(cacheKey, apiData);
             this.parsePiggies();
             this.loading = false;
         });
@@ -95,7 +95,7 @@ export default () => ({
                 let piggy = {
                     id: current.id,
                     name: current.attributes.name,
-                    percentage: parseInt(current.attributes.percentage),
+                    percentage: Number.parseInt(current.attributes.percentage),
                     amount: this.convertToPrimary ? current.attributes.pc_current_amount : current.attributes.current_amount,
                     // left to save
                     left_to_save: this.convertToPrimary ? current.attributes.pc_left_to_save : current.attributes.left_to_save,
@@ -110,7 +110,6 @@ export default () => ({
             }
         }
         this.piggies = Object.values(dataSet);
-        // console.log(this.piggies);
     },
 
     loadPiggyBanks() {
@@ -127,7 +126,6 @@ export default () => ({
         this.getFreshData();
     },
     init() {
-        // console.log('piggies init');
         apiData = [];
         Promise.all([getVariable('convert_to_primary', false)]).then((values) => {
 
@@ -136,19 +134,17 @@ export default () => ({
             this.loadPiggyBanks();
 
         });
-        window.store.observe('end', () => {
+        globalThis.store.observe('end', () => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('piggies observe end');
             apiData = [];
             this.loadPiggyBanks();
         });
-        window.store.observe('convert_to_primary', (newValue) => {
+        globalThis.store.observe('convert_to_primary', (newValue) => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('piggies observe convertToPrimary');
             this.convertToPrimary = newValue;
             this.loadPiggyBanks();
         });
diff --git a/resources/assets/v2/src/pages/dashboard/sankey.js b/resources/assets/v2/src/pages/dashboard/sankey.js
index 9b717e4668d..a4e5ed4d1a5 100644
--- a/resources/assets/v2/src/pages/dashboard/sankey.js
+++ b/resources/assets/v2/src/pages/dashboard/sankey.js
@@ -224,11 +224,11 @@ export default () => ({
     },
     parseTransaction(transaction) {
         let currencyCode = transaction.currency_code;
-        let amount       = parseFloat(transaction.amount);
+        let amount       = Number.parseFloat(transaction.amount);
         let flowKey;
         if (this.convertToPrimary) {
             currencyCode = transaction.primary_currency_code;
-            amount       = parseFloat(transaction.pc_amount);
+            amount       = Number.parseFloat(transaction.pc_amount);
         }
         if ('deposit' === transaction.type) {
             this.parseDeposit(transaction, currencyCode, amount);
@@ -337,12 +337,12 @@ export default () => ({
 
     },
     getFreshData() {
-        const start    = new Date(window.store.get('start'));
-        const end      = new Date(window.store.get('end'));
+        const start    = new Date(globalThis.store.get('start'));
+        const end      = new Date(globalThis.store.get('end'));
         const cacheKey = getCacheKey(SANKEY_CACHE_KEY, {start: start, end: end});
 
-        const cacheValid = window.store.get('cacheValid');
-        let cachedData   = window.store.get(cacheKey);
+        const cacheValid = globalThis.store.get('cacheValid');
+        let cachedData   = globalThis.store.get(cacheKey);
 
         if (cacheValid && typeof cachedData !== 'undefined') {
             transactions = cachedData;
@@ -361,23 +361,21 @@ export default () => ({
         this.downloadTransactions(params);
     },
     downloadTransactions(params) {
-        const start    = new Date(window.store.get('start'));
-        const end      = new Date(window.store.get('end'));
+        const start    = new Date(globalThis.store.get('start'));
+        const end      = new Date(globalThis.store.get('end'));
         const cacheKey = getCacheKey(SANKEY_CACHE_KEY, {convertToPrimary: this.convertToPrimary, start: start, end: end});
 
-        //console.log('Downloading page ' + params.page + '...');
         const getter = new Get();
         getter.list(params).then((response) => {
             transactions = [...transactions, ...response.data.data];
-            //this.drawChart(this.generateOptions(response.data));
             //this.loading = false;
-            if (parseInt(response.data.meta.pagination.total_pages) > params.page) {
+            if (Number.parseInt(response.data.meta.pagination.total_pages) > params.page) {
                 // continue to next page.
                 params.page++;
                 this.downloadTransactions(params);
                 return;
             }
-            window.store.set(cacheKey, transactions);
+            globalThis.store.set(cacheKey, transactions);
             this.drawChart(this.generateOptions());
             this.loading = false;
         });
@@ -397,7 +395,6 @@ export default () => ({
         this.getFreshData();
     },
     init() {
-        // console.log('sankey init');
         transactions = [];
         Promise.all([getVariable('convert_to_primary', false)]).then((values) => {
             this.convertToPrimary = values[0];
@@ -417,24 +414,21 @@ export default () => ({
             translations.revenue_account  = i18next.t('firefly.revenue_account');
             translations.budget           = i18next.t('firefly.budget');
 
-            // console.log('sankey after promises');
             afterPromises = true;
             this.loadChart();
 
         });
-        window.store.observe('end', () => {
+        globalThis.store.observe('end', () => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('sankey observe end');
             this.transactions = [];
             this.loadChart();
         });
-        window.store.observe('convert_to_primary', (newValue) => {
+        globalThis.store.observe('convert_to_primary', (newValue) => {
             if (!afterPromises) {
                 return;
             }
-            // console.log('sankey observe convertToPrimary');
             this.convertToPrimary = newValue;
             this.loadChart();
         });
diff --git a/resources/assets/v2/src/pages/dashboard/subscriptions.js b/resources/assets/v2/src/pages/dashboard/subscriptions.js
index 69c88ae2fcf..35e2bfd5f42 100644
--- a/resources/assets/v2/src/pages/dashboard/subscriptions.js
+++ b/resources/assets/v2/src/pages/dashboard/subscriptions.js
@@ -25,7 +25,6 @@ import {Chart} from "chart.js";
 import formatMoney from "../../util/format-money.js";
 import i18next from "i18next";
 
-// let chart = null;
 // let chartData = null;
 let afterPromises = false;
 let apiData = [];
@@ -33,12 +32,12 @@ let subscriptionData = {};
 let convertToPrimary = false;
 
 function addObjectGroupInfo(data) {
-    let objectGroupId = parseInt(data.object_group_id);
+    let objectGroupId = Number.parseInt(data.object_group_id);
     if (!subscriptionData.hasOwnProperty(objectGroupId)) {
         subscriptionData[objectGroupId] = {
             id: objectGroupId,
             title: null === data.object_group_title ? i18next.t('firefly.default_group_title_name_plain') : data.object_group_title,
-            order: parseInt(data.object_group_order),
+            order: Number.parseInt(data.object_group_order),
             payment_info: {},
             bills: [],
         };
@@ -63,7 +62,7 @@ function parseBillInfo(data) {
         name: data.attributes.name,
         amount_min: data.attributes.amount_min,
         amount_max: data.attributes.amount_max,
-        amount: (parseFloat(data.attributes.amount_max) + parseFloat(data.attributes.amount_min)) / 2,
+        amount: (Number.parseFloat(data.attributes.amount_max) + Number.parseFloat(data.attributes.amount_min)) / 2,
         currency_code: data.attributes.currency_code,
         // paid transactions:
         transactions: [],
@@ -82,7 +81,6 @@ function parseBillInfo(data) {
         times: data.attributes.pay_dates.length,
         amount: result.expected_amount
     });
-    // console.log(result);
     return result;
 }
 
@@ -95,9 +93,8 @@ function parsePaidTransactions(paid_dates, bill) {
     for (let i in paid_dates) {
         if (paid_dates.hasOwnProperty(i)) {
             const currentPayment = paid_dates[i];
-            // console.log(currentPayment);
             // math: -100+(paid/expected)*100
-            let percentage = Math.round(-100 + ((parseFloat(currentPayment.amount) ) / parseFloat(bill.amount)) * 100);
+            let percentage = Math.round(-100 + ((Number.parseFloat(currentPayment.amount) ) / Number.parseFloat(bill.amount)) * 100);
             let currentTransaction = {
                 amount: formatMoney(currentPayment.amount, currentPayment.currency_code),
                 percentage: percentage,
@@ -116,12 +113,11 @@ function parsePaidTransactions(paid_dates, bill) {
 }
 
 function isInRange(bill) {
-    let start = new Date(window.store.get('start'));
-    let end = new Date(window.store.get('end'));
+    let start = new Date(globalThis.store.get('start'));
+    let end = new Date(globalThis.store.get('end'));
     for(let i in bill.pay_dates) {
         if (bill.pay_dates.hasOwnProperty(i)) {
             let currentDate = bill.pay_dates[i];
-            //console.log(currentDate);
             if (currentDate >= start && currentDate <= end) {
                 return true;
             }
@@ -136,13 +132,12 @@ function downloadSubscriptions(params) {
         // first promise: parse the data:
         .then((response) => {
             let data = response.data.data;
-            //console.log(data);
             for (let i in data) {
                 if (data.hasOwnProperty(i)) {
                     let current = data[i];
                     if (current.attributes.active && current.attributes.pay_dates.length > 0) {
                         // create or update object group
-                        let objectGroupId = parseInt(current.attributes.object_group_id);
+                        let objectGroupId = Number.parseInt(current.attributes.object_group_id);
                         addObjectGroupInfo(current.attributes);
 
                         // create and update the bill.
@@ -188,7 +183,7 @@ function downloadSubscriptions(params) {
                                             unpaid: 0,
                                         };
                                     }
-                                    const amount = parseFloat(currentJournal.amount) * -1;
+                                    const amount = Number.parseFloat(currentJournal.amount) * -1;
                                     subscriptionData[objectGroupId].payment_info[currentJournal.currency_code].paid += amount;
                                 }
                             }
@@ -197,7 +192,7 @@ function downloadSubscriptions(params) {
                 }
             }
             // if next page, return the same function + 1 page:
-            if (parseInt(response.data.meta.pagination.total_pages) > params.page) {
+            if (Number.parseInt(response.data.meta.pagination.total_pages) > params.page) {
                 params.page++;
                 return downloadSubscriptions(params);
             }
@@ -226,11 +221,11 @@ export default () => ({
 
     startSubscriptions() {
         this.loading = true;
-        let start = new Date(window.store.get('start'));
-        let end = new Date(window.store.get('end'));
+        let start = new Date(globalThis.store.get('start'));
+        let end = new Date(globalThis.store.get('end'));
 
-        const cacheValid = window.store.get('cacheValid');
-        let cachedData = window.store.get(getCacheKey('ds_sub_data', {start: start, end: end}));
+        const cacheValid = globalThis.store.get('cacheValid');
+        let cachedData = globalThis.store.get(getCacheKey('ds_sub_data', {start: start, end: end}));
 
         if (cacheValid && typeof cachedData !== 'undefined' && false) {
             console.error('cannot handle yet');
@@ -259,7 +254,6 @@ export default () => ({
 
                     // then add to array
                     this.subscriptions.push(group);
-                    //console.log(group);
                 }
             }
             console.log('Subscriptions: ', this.subscriptions);
@@ -270,7 +264,6 @@ export default () => ({
     },
     drawPieChart(groupId, groupTitle, data) {
         let id = '#pie_' + groupId + '_' + data.currency_code;
-        //console.log(data);
         const unpaidAmount =  data.unpaid;
         const paidAmount =  data.paid;
         const currencyCode =  data.currency_code;
@@ -323,7 +316,7 @@ export default () => ({
 
 
         });
-        window.store.observe('end', () => {
+        globalThis.store.observe('end', () => {
             if (!afterPromises) {
                 return;
             }
@@ -331,7 +324,7 @@ export default () => ({
                 this.startSubscriptions();
             }
         });
-        window.store.observe('convert_to_primary', (newValue) => {
+        globalThis.store.observe('convert_to_primary', (newValue) => {
             if (!afterPromises) {
                 return;
             }
diff --git a/resources/assets/v2/src/pages/shared/dates.js b/resources/assets/v2/src/pages/shared/dates.js
index b975f1d690d..237bbb42a71 100644
--- a/resources/assets/v2/src/pages/shared/dates.js
+++ b/resources/assets/v2/src/pages/shared/dates.js
@@ -46,23 +46,23 @@ export default () => ({
 
     init() {
         this.range = {
-            start: new Date(window.store.get('start')),
-            end: new Date(window.store.get('end'))
+            start: new Date(globalThis.store.get('start')),
+            end: new Date(globalThis.store.get('end'))
         };
         this.defaultRange = {
-            start: new Date(window.store.get('start')),
-            end: new Date(window.store.get('end'))
+            start: new Date(globalThis.store.get('start')),
+            end: new Date(globalThis.store.get('end'))
         };
-        this.language = window.store.get('language');
-        this.locale = window.store.get('locale');
+        this.language = globalThis.store.get('language');
+        this.locale = globalThis.store.get('locale');
         this.locale = 'equal' === this.locale ? this.language : this.locale;
-        window.__localeId__ = this.language;
+        globalThis.__localeId__ = this.language;
         this.buildDateRange();
 
-        window.store.observe('start', (newValue) => {
+        globalThis.store.observe('start', (newValue) => {
             this.range.start = new Date(newValue);
         });
-        window.store.observe('end', (newValue) => {
+        globalThis.store.observe('end', (newValue) => {
             this.range.end = new Date(newValue);
             this.buildDateRange();
         });
@@ -70,7 +70,6 @@ export default () => ({
 
 
     buildDateRange() {
-        // console.log('Dates buildDateRange');
 
         // generate ranges
         let nextRange = this.getNextRange();
@@ -163,16 +162,13 @@ export default () => ({
 
     changeDateRange(e) {
         e.preventDefault();
-        // console.log('MainApp: changeDateRange');
         let target = e.currentTarget;
 
         let start = new Date(target.getAttribute('data-start'));
         let end = new Date(target.getAttribute('data-end'));
-        // console.log('MainApp: Change date range', start, end);
 
-        window.store.set('start', start);
-        window.store.set('end', end);
-        //this.buildDateRange();
+        globalThis.store.set('start', start);
+        globalThis.store.set('end', end);
         return false;
     },
 
diff --git a/resources/assets/v2/src/pages/template.js b/resources/assets/v2/src/pages/template.js
index bf573f27390..e9b5464bba9 100644
--- a/resources/assets/v2/src/pages/template.js
+++ b/resources/assets/v2/src/pages/template.js
@@ -79,7 +79,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/pages/transactions/create.js b/resources/assets/v2/src/pages/transactions/create.js
index b7c3ea50794..a4a9f81880e 100644
--- a/resources/assets/v2/src/pages/transactions/create.js
+++ b/resources/assets/v2/src/pages/transactions/create.js
@@ -260,12 +260,12 @@ let transactions = function () {
         },
 
         changedAmount(e) {
-            const index = parseInt(e.target.dataset.index);
-            this.entries[index].amount = parseFloat(e.target.value);
+            const index = Number.parseInt(e.target.dataset.index);
+            this.entries[index].amount = Number.parseFloat(e.target.value);
             this.groupProperties.totalAmount = 0;
             for (let i in this.entries) {
                 if (this.entries.hasOwnProperty(i)) {
-                    this.groupProperties.totalAmount = this.groupProperties.totalAmount + parseFloat(this.entries[i].amount);
+                    this.groupProperties.totalAmount = this.groupProperties.totalAmount + Number.parseFloat(this.entries[i].amount);
                 }
             }
         },
@@ -391,7 +391,7 @@ let transactions = function () {
             poster.post(submission).then((response) => {
                 const group = response.data.data;
                 // submission was a success!
-                this.groupProperties.id = parseInt(group.id);
+                this.groupProperties.id = Number.parseInt(group.id);
                 this.groupProperties.title = group.attributes.group_title ?? group.attributes.transactions[0].description
                 console.log('group title is now: ', this.groupProperties.title);
 
@@ -444,7 +444,7 @@ let transactions = function () {
                 }
                 return;
             }
-            window.location = 'transactions/show/' + this.groupProperties.id + '?transaction_group_id=' + this.groupProperties.id + '&message=created';
+            globalThis.location = 'transactions/show/' + this.groupProperties.id + '?transaction_group_id=' + this.groupProperties.id + '&message=created';
         },
 
         parseErrors(data) {
@@ -484,7 +484,6 @@ let transactions = function () {
                     }
                 });
                 const count = this.entries.length - 1;
-                // if(document.querySelector('#location_map_' + count)) { }
                 addLocation(count);
 
                 // addedSplit, is called from the HTML
@@ -545,7 +544,7 @@ let transactions = function () {
             // remove location from entry, fire event, do nothing else (the map is somebody else's problem).
 
             const target = e.currentTarget;
-            const index = parseInt(target.attributes['data-index'].value);
+            const index = Number.parseInt(target.attributes['data-index'].value);
             this.entries[index].hasLocation = false;
             this.entries[index].latitude = null;
             this.entries[index].longitude = null;
@@ -580,7 +579,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/pages/transactions/edit.js b/resources/assets/v2/src/pages/transactions/edit.js
index e95eca4ca49..be955bed1c3 100644
--- a/resources/assets/v2/src/pages/transactions/edit.js
+++ b/resources/assets/v2/src/pages/transactions/edit.js
@@ -161,7 +161,7 @@ let transactions = function () {
             putter.put(submission, {id: this.groupProperties.id}).then((response) => {
                 const group = response.data.data;
                 // submission was a success!
-                this.groupProperties.id = parseInt(group.id);
+                this.groupProperties.id = Number.parseInt(group.id);
                 this.groupProperties.title = group.attributes.group_title ?? group.attributes.transactions[0].description
 
                 // process attachments, if any:
@@ -275,15 +275,15 @@ let transactions = function () {
 
         getTransactionGroup() {
             this.entries = [];
-            const page = window.location.href.split('/');
-            const groupId = parseInt(page[page.length - 1]);
+            const page = globalThis.location.href.split('/');
+            const groupId = Number.parseInt(page[page.length - 1]);
             const getter = new Get();
             getter.show(groupId, {}).then((response) => {
                 const data = response.data.data;
-                this.groupProperties.id = parseInt(data.id);
+                this.groupProperties.id = Number.parseInt(data.id);
                 this.groupProperties.transactionType = data.attributes.transactions[0].type.toLowerCase();
                 this.groupProperties.title = data.attributes.title ?? data.attributes.transactions[0].description;
-                this.entries = parseDownloadedSplits(data.attributes.transactions, parseInt(data.id));
+                this.entries = parseDownloadedSplits(data.attributes.transactions, Number.parseInt(data.id));
 
                 // remove waiting thing.
                 this.notifications.wait.show = false;
@@ -291,7 +291,7 @@ let transactions = function () {
                 this.groupProperties.totalAmount = 0;
                 for (let i in this.entries) {
                     if (this.entries.hasOwnProperty(i)) {
-                        this.groupProperties.totalAmount = this.groupProperties.totalAmount + parseFloat(this.entries[i].amount);
+                        this.groupProperties.totalAmount = this.groupProperties.totalAmount + Number.parseFloat(this.entries[i].amount);
                         // TODO this does not include all possible types.
                         this.filters.source.push(this.entries[i].source_account.type);
                         this.filters.destination.push(this.entries[i].destination_account.type);
@@ -377,12 +377,12 @@ let transactions = function () {
         },
 
         changedAmount(e) {
-            const index = parseInt(e.target.dataset.index);
-            this.entries[index].amount = parseFloat(e.target.value);
+            const index = Number.parseInt(e.target.dataset.index);
+            this.entries[index].amount = Number.parseFloat(e.target.value);
             this.groupProperties.totalAmount = 0;
             for (let i in this.entries) {
                 if (this.entries.hasOwnProperty(i)) {
-                    this.groupProperties.totalAmount = this.groupProperties.totalAmount + parseFloat(this.entries[i].amount);
+                    this.groupProperties.totalAmount = this.groupProperties.totalAmount + Number.parseFloat(this.entries[i].amount);
                 }
             }
         },
@@ -399,7 +399,7 @@ let transactions = function () {
                 this.notifications.success.text = i18next.t('firefly.updated_journal_js', {description: this.groupProperties.title});
                 return;
             }
-            window.location = 'transactions/show/' + this.groupProperties.id + '?transaction_group_id=' + this.groupProperties.id + '&message=updated';
+            globalThis.location = 'transactions/show/' + this.groupProperties.id + '?transaction_group_id=' + this.groupProperties.id + '&message=updated';
         },
         // TODO is a duplicate
         parseErrors(data) {
@@ -447,7 +447,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/pages/transactions/index.js b/resources/assets/v2/src/pages/transactions/index.js
index 409cb3c58b5..839deec2465 100644
--- a/resources/assets/v2/src/pages/transactions/index.js
+++ b/resources/assets/v2/src/pages/transactions/index.js
@@ -82,7 +82,7 @@ let index = function () {
             this.notifications.wait.show = true;
             this.notifications.wait.text = i18next.t('firefly.wait_loading_data')
             this.transactions = [];
-            const urlParts = window.location.href.split('/');
+            const urlParts = globalThis.location.href.split('/');
             const type = urlParts[urlParts.length - 1];
             let getter = new Get();
 
@@ -145,9 +145,7 @@ let index = function () {
 
                             // set firstSplit = false for next run if applicable.
                             firstSplit = false;
-                            //console.log(transaction);
                             this.transactions.push(transaction);
-                            //this.gridOptions.rowData.push(transaction);
                         }
                     }
                 }
@@ -155,7 +153,6 @@ let index = function () {
             // only now, disable wait thing.
             this.notifications.wait.show = false;
             console.log('refresh!');
-            //this.table.refreshCells();
 
         },
     }
@@ -178,7 +175,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/pages/transactions/shared/autocomplete-functions.js b/resources/assets/v2/src/pages/transactions/shared/autocomplete-functions.js
index 4755f2e33cd..d96b6fcef81 100644
--- a/resources/assets/v2/src/pages/transactions/shared/autocomplete-functions.js
+++ b/resources/assets/v2/src/pages/transactions/shared/autocomplete-functions.js
@@ -19,7 +19,7 @@
  */
 
 export function changeCategory(item, ac) {
-    const index = parseInt(ac._searchInput.attributes['data-index'].value);
+    const index = Number.parseInt(ac._searchInput.attributes['data-index'].value);
     if (typeof item !== 'undefined' && item.name) {
         document.querySelector('#form')._x_dataStack[0].$data.entries[index].category_name = item.name;
         return;
@@ -28,7 +28,7 @@ export function changeCategory(item, ac) {
 }
 
 export function changeDescription(item, ac) {
-    const index = parseInt(ac._searchInput.attributes['data-index'].value);
+    const index = Number.parseInt(ac._searchInput.attributes['data-index'].value);
     if (typeof item !== 'undefined' && item.description) {
         document.querySelector('#form')._x_dataStack[0].$data.entries[index].description = item.description;
         return;
@@ -38,7 +38,7 @@ export function changeDescription(item, ac) {
 
 export function changeDestinationAccount(item, ac) {
     if (typeof item === 'undefined') {
-        const index = parseInt(ac._searchInput.attributes['data-index'].value);
+        const index = Number.parseInt(ac._searchInput.attributes['data-index'].value);
         let destination = document.querySelector('#form')._x_dataStack[0].$data.entries[index].destination_account;
 
         if (destination.name === ac._searchInput.value) {
@@ -53,7 +53,7 @@ export function changeDestinationAccount(item, ac) {
 }
 
 export function selectDestinationAccount(item, ac) {
-    const index = parseInt(ac._searchInput.attributes['data-index'].value);
+    const index = Number.parseInt(ac._searchInput.attributes['data-index'].value);
     document.querySelector('#form')._x_dataStack[0].$data.entries[index].destination_account = {
         id: item.id, name: item.name, alpine_name: item.name, type: item.type, currency_code: item.currency_code,
     };
@@ -62,7 +62,7 @@ export function selectDestinationAccount(item, ac) {
 
 export function changeSourceAccount(item, ac) {
     if (typeof item === 'undefined') {
-        const index = parseInt(ac._searchInput.attributes['data-index'].value);
+        const index = Number.parseInt(ac._searchInput.attributes['data-index'].value);
         let source = document.querySelector('#form')._x_dataStack[0].$data.entries[index].source_account;
         if (source.name === ac._searchInput.value) {
             return;
@@ -76,7 +76,7 @@ export function changeSourceAccount(item, ac) {
 }
 
 export function selectSourceAccount(item, ac) {
-    const index = parseInt(ac._searchInput.attributes['data-index'].value);
+    const index = Number.parseInt(ac._searchInput.attributes['data-index'].value);
     document.querySelector('#form')._x_dataStack[0].$data.entries[index].source_account = {
         id: item.id, name: item.name, alpine_name: item.name, type: item.type, currency_code: item.currency_code,
     };
diff --git a/resources/assets/v2/src/pages/transactions/shared/load-piggy-banks.js b/resources/assets/v2/src/pages/transactions/shared/load-piggy-banks.js
index c0143455393..f7ee8eeb43a 100644
--- a/resources/assets/v2/src/pages/transactions/shared/load-piggy-banks.js
+++ b/resources/assets/v2/src/pages/transactions/shared/load-piggy-banks.js
@@ -54,7 +54,6 @@ export function loadPiggyBanks() {
                 piggyBanks[objectGroupId].piggyBanks.sort((a, b) => a.order - b.order);
             }
         }
-        //tempObject.sort((a,b) => a.order - b.order);
         return Object.keys(piggyBanks).sort().reduce((obj, key) => {
             obj[key] = piggyBanks[key];
             return obj;
diff --git a/resources/assets/v2/src/pages/transactions/shared/manage-locations.js b/resources/assets/v2/src/pages/transactions/shared/manage-locations.js
index 92fce381652..c643a287b16 100644
--- a/resources/assets/v2/src/pages/transactions/shared/manage-locations.js
+++ b/resources/assets/v2/src/pages/transactions/shared/manage-locations.js
@@ -56,7 +56,6 @@ function addPointToMap(e) {
 }
 
 function saveZoomOfMap(e) {
-    //let index = parseInt(e.sourceTarget._container.attributes['data-index'].value);
     let index = 0;
     const zoomEvent = new CustomEvent('location-zoom', {
         detail: {
@@ -89,7 +88,6 @@ export function addLocation(index) {
     if (typeof maps[index] === 'undefined') {
         // map holder is always the same:
 
-        //let holder = document.getElementById('location_map_' + index);
         let holder = document.getElementById('location_map');
         if (holder) {
             maps[index] = L.map(holder).setView([holder.dataset.latitude, holder.dataset.longitude], holder.dataset.zoomLevel);
diff --git a/resources/assets/v2/src/pages/transactions/shared/parse-downloaded-splits.js b/resources/assets/v2/src/pages/transactions/shared/parse-downloaded-splits.js
index d5685f60ef7..566d40a6a39 100644
--- a/resources/assets/v2/src/pages/transactions/shared/parse-downloaded-splits.js
+++ b/resources/assets/v2/src/pages/transactions/shared/parse-downloaded-splits.js
@@ -57,11 +57,11 @@ export function parseDownloadedSplits(downloads, groupId) {
             current.tags = download.tags;
 
             // amount
-            current.amount = parseFloat(download.amount).toFixed(download.currency_decimal_places);
+            current.amount = Number.parseFloat(download.amount).toFixed(download.currency_decimal_places);
             current.currency_code = download.currency_code;
             if(null !== download.foreign_amount) {
                 current.forein_currency_code = download.foreign_currency_code;
-                current.foreign_amount = parseFloat(download.foreign_amount).toFixed(download.foreign_currency_decimal_places);
+                current.foreign_amount = Number.parseFloat(download.foreign_amount).toFixed(download.foreign_currency_decimal_places);
             }
 
             // date and description
diff --git a/resources/assets/v2/src/pages/transactions/shared/process-attachments.js b/resources/assets/v2/src/pages/transactions/shared/process-attachments.js
index 3e493ecc1dd..280c5b3b889 100644
--- a/resources/assets/v2/src/pages/transactions/shared/process-attachments.js
+++ b/resources/assets/v2/src/pages/transactions/shared/process-attachments.js
@@ -29,7 +29,7 @@ let uploadFiles = function (fileData) {
         if (fileData.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294 && false === hasError) {
             let poster = new AttachmentPost();
             poster.post(fileData[key].name, 'TransactionJournal', fileData[key].journal).then(response => {
-                let attachmentId = parseInt(response.data.data.id);
+                let attachmentId = Number.parseInt(response.data.data.id);
                 poster.upload(attachmentId, fileData[key].content).then(attachmentResponse => {
                     uploads++;
                     if (uploads === count) {
diff --git a/resources/assets/v2/src/pages/transactions/shared/splice-errors-into-transactions.js b/resources/assets/v2/src/pages/transactions/shared/splice-errors-into-transactions.js
index 8df406d30e1..f119a96ff6c 100644
--- a/resources/assets/v2/src/pages/transactions/shared/splice-errors-into-transactions.js
+++ b/resources/assets/v2/src/pages/transactions/shared/splice-errors-into-transactions.js
@@ -42,7 +42,7 @@ export function spliceErrorsIntoTransactions(errors, transactions) {
                 //this.group_title_errors = errors.errors[key];
                 continue;
             }
-            transactionIndex = parseInt(key.split('.')[1]);
+            transactionIndex = Number.parseInt(key.split('.')[1]);
             fieldName = key.split('.')[2];
             errorArray = cleanupErrors(key, fieldName, errors[key]);
             if (!transactions.hasOwnProperty(transactionIndex)) {
diff --git a/resources/assets/v2/src/pages/transactions/show.js b/resources/assets/v2/src/pages/transactions/show.js
index ad5a3f55ab3..1983cb27dc8 100644
--- a/resources/assets/v2/src/pages/transactions/show.js
+++ b/resources/assets/v2/src/pages/transactions/show.js
@@ -70,16 +70,16 @@ let show = function () {
         init() {
             this.notifications.wait.show = true;
             this.notifications.wait.text = i18next.t('firefly.wait_loading_data')
-            const page = window.location.href.split('/');
-            const groupId = parseInt(page[page.length - 1]);
+            const page = globalThis.location.href.split('/');
+            const groupId = Number.parseInt(page[page.length - 1]);
             const getter = new Get();
             getter.show(groupId, {}).then((response) => {
                 const data = response.data.data;
-                this.groupProperties.id = parseInt(data.id);
+                this.groupProperties.id = Number.parseInt(data.id);
                 this.groupProperties.transactionType = data.attributes.transactions[0].type;
                 this.groupProperties.transactionTypeTranslated = i18next.t('firefly.' + data.attributes.transactions[0].type);
                 this.groupProperties.title = data.attributes.title ?? data.attributes.transactions[0].description;
-                this.entries = parseDownloadedSplits(data.attributes.transactions, parseInt(data.id));
+                this.entries = parseDownloadedSplits(data.attributes.transactions, Number.parseInt(data.id));
                 // remove waiting thing.
                 this.notifications.wait.show = false;
             }).then(() => {
@@ -90,13 +90,13 @@ let show = function () {
 
                         if (undefined === this.amounts[currencyCode]) {
                             this.amounts[currencyCode] = 0;
-                            this.amounts[currencyCode] += parseFloat(this.entries[i].amount);
+                            this.amounts[currencyCode] += Number.parseFloat(this.entries[i].amount);
                         }
                         if (null !== foreignCurrencyCode && '' !== foreignCurrencyCode && undefined === this.amounts[foreignCurrencyCode]) {
                             this.amounts[foreignCurrencyCode] = 0;
-                            this.amounts[foreignCurrencyCode] += parseFloat(this.entries[i].foreign_amount);
+                            this.amounts[foreignCurrencyCode] += Number.parseFloat(this.entries[i].foreign_amount);
                         }
-                        if (0 === parseInt(i)) {
+                        if (0 === Number.parseInt(i)) {
                             this.groupProperties.date = this.entries[i].date;
                         }
                     }
@@ -110,9 +110,9 @@ let show = function () {
                         // this is all manual work for now, and should be better
                         // TODO make better
                         current.addEventListener('save', function (e) {
-                            const journalId = parseInt(e.currentTarget.dataset.id);
-                            const groupId = parseInt(e.currentTarget.dataset.group);
-                            const length = parseInt(e.currentTarget.dataset.length); // TODO not happy with this.
+                            const journalId = Number.parseInt(e.currentTarget.dataset.id);
+                            const groupId = Number.parseInt(e.currentTarget.dataset.group);
+                            const length = Number.parseInt(e.currentTarget.dataset.length); // TODO not happy with this.
                             const newDescription = e.currentTarget.textContent;
                             console.log(length);
                             if (1 === length) {
@@ -151,7 +151,7 @@ document.addEventListener('firefly-iii-bootstrapped', () => {
     loadPage();
 });
 // or is bootstrapped before event is triggered.
-if (window.bootstrapped) {
+if (globalThis.bootstrapped) {
     console.log('Loaded through window variable.');
     loadPage();
 }
diff --git a/resources/assets/v2/src/store/get-configuration.js b/resources/assets/v2/src/store/get-configuration.js
index d3d2a7c53a0..4bd503bdc82 100644
--- a/resources/assets/v2/src/store/get-configuration.js
+++ b/resources/assets/v2/src/store/get-configuration.js
@@ -22,23 +22,22 @@ import Get from "../api/v1/configuration/get.js";
 import {parseResponse} from "./get-variable.js";
 
 export function getConfiguration(name, defaultValue = null) {
-    const validCache = window.store.get('cacheValid');
-    // currently unused, window.X can be used by the blade template
+    const validCache = globalThis.store.get('cacheValid');
+    // currently unused, globalThis.X can be used by the blade template
     // to make things available quicker than if the store has to grab it through the API.
     // then again, it's not that slow.
-    if (validCache && window.hasOwnProperty(name)) {
+    if (validCache && globalThis.hasOwnProperty(name)) {
         console.log('Return configuration "' + name + '" from window: ' + window[name]);
         return Promise.resolve(window[name]);
     }
     // load from store2, if it's present.
-    const fromStore = window.store.get(name);
+    const fromStore = globalThis.store.get(name);
     if (validCache && typeof fromStore !== 'undefined') {
         console.log('Return configuration "' + name + '" from store: ' + fromStore);
         return Promise.resolve(fromStore);
     }
     let getter = (new Get);
     return getter.getByName(name).then((response) => {
-        // console.log('Get "' + name + '" from API');
         console.log('Return configuration "' + name + '" from API: ' + parseConfigurationResponse(name, response));
         return Promise.resolve(parseConfigurationResponse(name, response));
     }).catch((error) => {
@@ -49,7 +48,7 @@ export function getConfiguration(name, defaultValue = null) {
 }
 export function parseConfigurationResponse(name, response) {
     let value = response.data.data.value;
-    window.store.set(name, value);
+    globalThis.store.set(name, value);
     return value;
 }
 
diff --git a/resources/assets/v2/src/store/get-fresh-variable.js b/resources/assets/v2/src/store/get-fresh-variable.js
index e591d9c006d..05c99825aad 100644
--- a/resources/assets/v2/src/store/get-fresh-variable.js
+++ b/resources/assets/v2/src/store/get-fresh-variable.js
@@ -24,7 +24,6 @@ import Post from "../api/v1/preferences/post.js";
 export function getFreshVariable(name, defaultValue = null) {
     let getter = (new Get);
     return getter.getByName(name).then((response) => {
-        // console.log('Get from API');
         return Promise.resolve(parseResponse(name, response));
     }).catch((response) => {
         if(response.status === 404) {
diff --git a/resources/assets/v2/src/store/get-variable.js b/resources/assets/v2/src/store/get-variable.js
index b3010827b06..306799591a4 100644
--- a/resources/assets/v2/src/store/get-variable.js
+++ b/resources/assets/v2/src/store/get-variable.js
@@ -22,16 +22,16 @@ import Get from "../api/v1/preferences/index.js";
 import Post from "../api/v1/preferences/post.js";
 
 export function getVariable(name, defaultValue = null) {
-    const validCache = window.store.get('cacheValid');
-    // currently unused, window.X can be used by the blade template
+    const validCache = globalThis.store.get('cacheValid');
+    // currently unused, globalThis.X can be used by the blade template
     // to make things available quicker than if the store has to grab it through the API.
     // then again, it's not that slow.
-    if (validCache && window.hasOwnProperty(name)) {
+    if (validCache && globalThis.hasOwnProperty(name)) {
         console.log('Returning "'+name+'" from window: ' + window[name]);
         return Promise.resolve(window[name]);
     }
     // load from store2, if it's present.
-    const fromStore = window.store.get(name);
+    const fromStore = globalThis.store.get(name);
     if (validCache && typeof fromStore !== 'undefined') {
         console.log('Returning "'+name+'" from store: ' + fromStore);
         return Promise.resolve(fromStore);
@@ -58,7 +58,7 @@ export function getVariable(name, defaultValue = null) {
 
 export function parseResponse(name, response) {
     let value = response.data.data.attributes.data;
-    window.store.set(name, value);
+    globalThis.store.set(name, value);
     return value;
 }
 
diff --git a/resources/assets/v2/src/store/get-variables.js b/resources/assets/v2/src/store/get-variables.js
index ecdf586277a..8f935c161d0 100644
--- a/resources/assets/v2/src/store/get-variables.js
+++ b/resources/assets/v2/src/store/get-variables.js
@@ -41,7 +41,7 @@ export function getVariables(preferences) {
 
 export function parseResponse(name, response) {
     let value = response.data.data.attributes.data;
-    window.store.set(name, value);
+    globalThis.store.set(name, value);
     return value;
 }
 
diff --git a/resources/assets/v2/src/store/set-variable.js b/resources/assets/v2/src/store/set-variable.js
index 2501997ee03..a2d4f671fa9 100644
--- a/resources/assets/v2/src/store/set-variable.js
+++ b/resources/assets/v2/src/store/set-variable.js
@@ -23,15 +23,15 @@ import Post from "../api/v1/preferences/post.js";
 
 export function setVariable(name, value = null) {
 
-    // currently unused, window.X can be used by the blade template
+    // currently unused, globalThis.X can be used by the blade template
     // to make things available quicker than if the store has to grab it through the API.
     // then again, it's not that slow.
 
-    // set in window.x
+    // set in globalThis.x
     window[name] = value;
 
     // set in store:
-    window.store.set(name, value);
+    globalThis.store.set(name, value);
 
     // post to user preferences (because why not):
     let putter = new Put();
diff --git a/resources/assets/v2/src/support/ag-grid/AmountEditor.js b/resources/assets/v2/src/support/ag-grid/AmountEditor.js
index 4af7697b267..662f9ba35a7 100644
--- a/resources/assets/v2/src/support/ag-grid/AmountEditor.js
+++ b/resources/assets/v2/src/support/ag-grid/AmountEditor.js
@@ -42,20 +42,17 @@ export default class AmountEditor {
         this.input.style.overflow = 'hidden';
         this.input.style.textOverflow = 'ellipsis';
         this.input.autofocus = true;
-        this.input.value = parseFloat(params.value.amount).toFixed(params.value.decimal_places);
+        this.input.value = Number.parseFloat(params.value.amount).toFixed(params.value.decimal_places);
 
-        //this.input.onchange = function(e) { this.onChange(e, params);}
         //  params.onValueChange;
         //this.input.onblur = params.onValueChange;
 
-        // this.input.onblur = function () {
         //     params.stopEditing();
         // };
 
-        // this.eGui.innerHTML = `<input
         // type="number" min="0"
         // onChange="params.onValueChange"
-        // step="any" style="overflow: hidden; text-overflow: ellipsis" value="${parseFloat(params.value.amount).toFixed(params.value.decimal_places)}" />`;
+        // step="any" style="overflow: hidden; text-overflow: ellipsis" value="${Number.parseFloat(params.value.amount).toFixed(params.value.decimal_places)}" />`;
     }
     onChange(e) {
         console.log('AmountEditor.onChange');
@@ -78,7 +75,7 @@ export default class AmountEditor {
 
     getValue() {
         console.log('AmountEditor.getValue');
-        this.originalValue.amount = parseFloat(this.input.value);
+        this.originalValue.amount = Number.parseFloat(this.input.value);
 
         // needs a manual submission to Firefly III here.
         this.submitAmount(this.originalValue);
diff --git a/resources/assets/v2/src/support/ag-grid/TransactionDataSource.js b/resources/assets/v2/src/support/ag-grid/TransactionDataSource.js
index fbdddedc75f..ddd0887d365 100644
--- a/resources/assets/v2/src/support/ag-grid/TransactionDataSource.js
+++ b/resources/assets/v2/src/support/ag-grid/TransactionDataSource.js
@@ -88,8 +88,8 @@ import Get from "../../api/v2/model/transaction/get.js";
                         entry.user_group = current.attributes.user_group;
 
                         // create actual transaction:
-                        entry.id = parseInt(current.id);
-                        entry.transaction_journal_id = parseInt(transaction.transaction_journal_id);
+                        entry.id = Number.parseInt(current.id);
+                        entry.transaction_journal_id = Number.parseInt(transaction.transaction_journal_id);
                         entry.description = transaction.description;
                         entry.date = new Date(transaction.date);
 
@@ -114,8 +114,8 @@ import Get from "../../api/v2/model/transaction/get.js";
                         };
 
                         entry.amount = {
-                            id: parseInt(current.id),
-                            transaction_journal_id: parseInt(transaction.transaction_journal_id),
+                            id: Number.parseInt(current.id),
+                            transaction_journal_id: Number.parseInt(transaction.transaction_journal_id),
                             type: transaction.type,
                             amount: transaction.amount,
                             currency_code: transaction.currency_code,
diff --git a/resources/assets/v2/src/support/default-chart-settings.js b/resources/assets/v2/src/support/default-chart-settings.js
index b3096edc561..7ad51e7a345 100644
--- a/resources/assets/v2/src/support/default-chart-settings.js
+++ b/resources/assets/v2/src/support/default-chart-settings.js
@@ -50,7 +50,6 @@ function getDefaultChartSettings(type) {
                     tooltip: {
                         callbacks: {
                             label: function (tooltipItem) {
-                                // console.log(tooltipItem);
                                 let currency = tooltipItem.dataset.currency_code;
                                 return formatMoney(tooltipItem.raw, currency);
                             },
@@ -99,7 +98,6 @@ function getDefaultChartSettings(type) {
                     tooltip: {
                         callbacks: {
                             label: function (tooltipItem) {
-                                // console.log(tooltipItem);
                                 let currency = tooltipItem.dataset.currency_code;
                                 return formatMoney(tooltipItem.raw, currency);
                             },
diff --git a/resources/assets/v2/src/support/editable/GenericEditor.js b/resources/assets/v2/src/support/editable/GenericEditor.js
index 49258416f86..137c5058585 100644
--- a/resources/assets/v2/src/support/editable/GenericEditor.js
+++ b/resources/assets/v2/src/support/editable/GenericEditor.js
@@ -34,7 +34,6 @@ export default class GenericEditor {
         this.options.index = this.element.dataset.index;
         this.options.model = this.element.dataset.model;
         this.options.field = this.element.dataset.field;
-        //this.options.field = this.element.dataset.type;
         console.log('GenericEditor[' + this.options.index + '].init()');
     }
 
diff --git a/resources/assets/v2/src/support/get-cache-key.js b/resources/assets/v2/src/support/get-cache-key.js
index adedf73b49d..a1192771a5e 100644
--- a/resources/assets/v2/src/support/get-cache-key.js
+++ b/resources/assets/v2/src/support/get-cache-key.js
@@ -20,7 +20,6 @@
 
 import {format} from "date-fns";
 import store from "store";
-//const { createHash } = require('crypto');
 
 
 
diff --git a/resources/assets/v2/src/support/get-colors.js b/resources/assets/v2/src/support/get-colors.js
index 7333eb00701..e34ce7e1d3d 100644
--- a/resources/assets/v2/src/support/get-colors.js
+++ b/resources/assets/v2/src/support/get-colors.js
@@ -40,13 +40,12 @@ let index = 0;
 
 // or cycle through X colors:
 
-if ('light' === window.theme) {
-    // red.lighten(0.3).clearer(0.3);
+if ('light' === globalThis.theme) {
     // green.lighten(0.3).clearer(0.3);
     // blue.lighten(0.3).clearer(0.3);
     // orange.lighten(0.3).clearer(0.3);
 }
-if ('dark' === window.theme) {
+if ('dark' === globalThis.theme) {
     red.darken(0.3).desaturate(0.3);
     green.darken(0.3).desaturate(0.3);
     blue.darken(0.3).desaturate(0.3);
@@ -66,7 +65,6 @@ function getColors(type, field) {
         default:
             let correctedIndex = Math.floor(index / 2);
             let currentIndex = correctedIndex % allColors.length;
-            //console.log('index:' + index + ', correctedIndex:' + correctedIndex + ', currentIndex:' + currentIndex);
             background = new Color(allColors[currentIndex].rgbString());
             background.lighten(0.38);
 
@@ -78,7 +76,6 @@ function getColors(type, field) {
         case 'spent':
             background = new Color(blue.rgbString());
             background.lighten(0.38);
-            //console.log('#9ad0f5 vs ' + background.hexString());
             colors = {
                 borderColor: blue.rgbString(),
                 backgroundColor: background.rgbString(),
@@ -103,7 +100,6 @@ function getColors(type, field) {
         case 'overspent':
             background = new Color(red.rgbString());
             background.lighten(0.22);
-            // console.log('#ffb1c1 vs ' + background.hexString());
             colors = {
                 borderColor: red.rgbString(),
                 backgroundColor: background.rgbString(),
diff --git a/resources/assets/v2/src/support/get-viewrange.js b/resources/assets/v2/src/support/get-viewrange.js
index 45084cfa615..e2ea887976b 100644
--- a/resources/assets/v2/src/support/get-viewrange.js
+++ b/resources/assets/v2/src/support/get-viewrange.js
@@ -33,7 +33,6 @@ function getViewRange(viewRange, today) {
     let start;
     let end;
 
-    // console.log('getViewRange: ' + viewRange);
 
     switch (viewRange) {
         case 'last365':
diff --git a/resources/assets/v2/src/support/inline-edit.js b/resources/assets/v2/src/support/inline-edit.js
index 190a539e1dd..25fac8025ab 100644
--- a/resources/assets/v2/src/support/inline-edit.js
+++ b/resources/assets/v2/src/support/inline-edit.js
@@ -21,8 +21,8 @@
 import DarkEditable from "../libraries/dark-editable/dark-editable.js";
 
 function inlineJournalDescription(element) {
-    const journalId = parseInt(element.dataset.id);
-    const groupId = parseInt(element.dataset.group);
+    const journalId = Number.parseInt(element.dataset.id);
+    const groupId = Number.parseInt(element.dataset.group);
     const opts = {
         pk: groupId,
         mode: 'inline',
diff --git a/resources/assets/v2/src/support/page-navigation.js b/resources/assets/v2/src/support/page-navigation.js
index 10429adecea..b530c96c224 100644
--- a/resources/assets/v2/src/support/page-navigation.js
+++ b/resources/assets/v2/src/support/page-navigation.js
@@ -27,7 +27,6 @@ function logarithmicPaginationLinks(lastPage, matchPage, linkURL) {
         //  href="'+ linkURL+ p + '"
         return '<li class="page-item"><a class="page-link" href="#"  @click.prevent="goToPage('+p+')">'+p+'</a></li>';
 
-        // return ((p === page) ? "<b>" + p + "</b>" : '<a href="' + linkURL + p + '">' + p + "</a>");
     }
 
     let page = (matchPage ? matchPage : 1), LINKS_PER_STEP = 5, lastp1 = 1, lastp2 = page, p1 = 1, p2 = page,
@@ -72,8 +71,8 @@ function logarithmicPaginationLinks(lastPage, matchPage, linkURL) {
 
 export default function pageNavigation(totalPages, currentPage, navigationURL) {
 
-    totalPages = parseInt(totalPages);
-    currentPage = parseInt(currentPage);
+    totalPages = Number.parseInt(totalPages);
+    currentPage = Number.parseInt(currentPage);
     let html = '<nav aria-label="Page navigation">';
     html += '<ul class="pagination">';
     if(currentPage > 1) {
diff --git a/resources/assets/v2/src/support/page-settings/show-internals-button.js b/resources/assets/v2/src/support/page-settings/show-internals-button.js
index 948fdcab6f3..8fc4b95fdfe 100644
--- a/resources/assets/v2/src/support/page-settings/show-internals-button.js
+++ b/resources/assets/v2/src/support/page-settings/show-internals-button.js
@@ -20,7 +20,6 @@
 
 
 export function showInternalsButton() {
-    // console.log('showInternalsButton');
     let obj = document.querySelector('.toggle-page-internals');
     if (obj === null) {
         return;
diff --git a/resources/assets/v2/src/util/format-money.js b/resources/assets/v2/src/util/format-money.js
index 576a693bbe3..24f5710102f 100644
--- a/resources/assets/v2/src/util/format-money.js
+++ b/resources/assets/v2/src/util/format-money.js
@@ -29,7 +29,7 @@ export default function (amount, currencyCode) {
         console.warn('format-money: currencyCode is not a valid ISO 4217 code:', currencyCode);
         return '';
     }
-    let locale = window.__localeId__.replace('_', '-');
+    let locale = globalThis.__localeId__.replace('_', '-');
 
     return Intl.NumberFormat(locale, {
         style: 'currency',
diff --git a/resources/assets/v2/src/util/format.js b/resources/assets/v2/src/util/format.js
index 93018b59014..79a97db48e8 100644
--- a/resources/assets/v2/src/util/format.js
+++ b/resources/assets/v2/src/util/format.js
@@ -92,7 +92,7 @@ const locales = {
 // by providing a default string of 'PP' or any of its variants for `formatStr`
 // it will format dates in whichever way is appropriate to the locale
 export default function (date, formatStr = 'PP') {
-    let locale = window.__localeId__.replace('_', '');
+    let locale = globalThis.__localeId__.replace('_', '');
     return format(date, formatStr, {
         locale: locales[locale] ?? locales[locale.slice(0, 2)] ?? locales['enUS'] // or global.__localeId__
     })
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index 460462e6847..02c7068c58f 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -30,24 +30,13 @@
         </td>
     </tr>
     <tr>
-        <th class="hidden-xs">&nbsp;</th>
-        <th>{{ trans('list.description') }}</th>
-        <th>{{ trans('list.amount') }}</th>
-        {% if config('firefly.feature_flags.running_balance_column') %}
-        <th>{{ trans('list.running_balance') }}</th>
-        {% endif %}
-        <th>{{ trans('list.date') }}</th>
-        <th>{{ trans('list.source_account') }}</th>
-        <th>{{ trans('list.destination_account') }}</th>
-        {% if showCategory %}
-            <th class="hidden-xs">{{ trans('list.category') }}</th>
-        {% endif %}
+ <th class="hidden-xs" scope="col">&nbsp;</th>  <th scope="col">{{ trans('list.description') }}</th>  <th scope="col">{{ trans('list.amount') }}</th>         {% if config('firefly.feature_flags.running_balance_column') %}
+ <th scope="col">{{ trans('list.running_balance') }}</th>         {% endif %}
+ <th scope="col">{{ trans('list.date') }}</th>  <th scope="col">{{ trans('list.source_account') }}</th>  <th scope="col">{{ trans('list.destination_account') }}</th>         {% if showCategory %}
+ <th class="hidden-xs" scope="col">{{ trans('list.category') }}</th>         {% endif %}
         {% if showBudget %}
-            <th class="hidden-xs">{{ trans('list.budget') }}</th>
-        {% endif %}
-        <th class="hidden-xs">&nbsp;</th><!-- actions -->
-        <th class="hidden-xs">&nbsp;</th><!-- checkbox -->
-    </tr>
+ <th class="hidden-xs" scope="col">{{ trans('list.budget') }}</th>         {% endif %}
+ <th class="hidden-xs" scope="col">&nbsp;</th><!-- actions -->  <th class="hidden-xs" scope="col">&nbsp;</th><!-- checkbox -->     </tr>
     </thead>
     <tbody>
     {% for group in groups %}
diff --git a/resources/views/partials/debug-table.twig b/resources/views/partials/debug-table.twig
index 6dd268a04e2..8dc0bdbaf9d 100644
--- a/resources/views/partials/debug-table.twig
+++ b/resources/views/partials/debug-table.twig
@@ -1,12 +1,9 @@
 <table>
     <thead>
     <tr>
-        <th colspan="2">System information</th>
-    </tr>
+ <th colspan="2" scope="col">System information</th>     </tr>
     <tr>
-        <th>Item</th>
-        <th>Value</th>
-    </tr>
+ <th scope="col">Item</th>  <th scope="col">Value</th>     </tr>
     </thead>
     <tbody>
     {# Firefly III version #}
@@ -54,12 +51,9 @@
 <table>
     <thead>
     <tr>
-        <th colspan="2">Firefly III information</th>
-    </tr>
+ <th colspan="2" scope="col">Firefly III information</th>     </tr>
     <tr>
-        <th>Item</th>
-        <th>Value</th>
-    </tr>
+ <th scope="col">Item</th>  <th scope="col">Value</th>     </tr>
     </thead>
     <tbody>
     <tr>
@@ -128,12 +122,9 @@
 <table>
     <thead>
     <tr>
-        <th colspan="2">User-specific information</th>
-    </tr>
+ <th colspan="2" scope="col">User-specific information</th>     </tr>
     <tr>
-        <th>Item</th>
-        <th>Value</th>
-    </tr>
+ <th scope="col">Item</th>  <th scope="col">Value</th>     </tr>
     </thead>
     <tbody>
     <tr>
diff --git a/resources/views/v2/accounts/index.blade.php b/resources/views/v2/accounts/index.blade.php
index 05d54582ae1..ba25166de8c 100644
--- a/resources/views/v2/accounts/index.blade.php
+++ b/resources/views/v2/accounts/index.blade.php
@@ -96,36 +96,28 @@
                                     <td x-show="tableColumns.menu.visible && tableColumns.menu.enabled">&nbsp;</td>
                                 </tr>
                                 <tr>
-                                    <th x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled">
-                                        &nbsp;
+ <th x-show="tableColumns.drag_and_drop.visible && tableColumns.drag_and_drop.enabled" scope="col">                                         &nbsp;
                                     </th>
-                                    <th x-show="tableColumns.active.visible && tableColumns.active.enabled">
-                                        <a href="#" x-on:click.prevent="sort('active')">{{ __('list.active') }}</a>
+ <th x-show="tableColumns.active.visible && tableColumns.active.enabled" scope="col">                                         <a href="#" x-on:click.prevent="sort('active')">{{ __('list.active') }}</a>
                                         <em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'asc'"
                                             class="fa-solid fa-arrow-down-short-wide"></em>
                                         <em x-show="pageOptions.sortingColumn === 'active' && pageOptions.sortDirection === 'desc'"
                                             class="fa-solid fa-arrow-down-wide-short"></em>
                                     </th>
-                                    <th x-show="tableColumns.name.visible && tableColumns.name.enabled">
-                                        <a href="#" x-on:click.prevent="sort('name')">{{ __('list.name') }}</a>
+ <th x-show="tableColumns.name.visible && tableColumns.name.enabled" scope="col">                                         <a href="#" x-on:click.prevent="sort('name')">{{ __('list.name') }}</a>
                                         <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'asc'"
                                             class="fa-solid fa-arrow-down-a-z"></em>
                                         <em x-show="pageOptions.sortingColumn === 'name' && pageOptions.sortDirection === 'desc'" class="fa-solid fa-arrow-down-z-a"></em>
                                         <a @click.prevent="showFilterDialog('name')" href="#" data-bs-toggle="modal" data-bs-target="#filterModal"><em class="fa-solid fa-magnifying-glass"></em></a>
 
                                     </th>
-                                    <th x-show="tableColumns.type.visible && tableColumns.type.enabled">{{ __('list.type') }}</th>
-                                    <th x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled">
-                                        {{ __('list.liability_type') }}
+ <th x-show="tableColumns.type.visible && tableColumns.type.enabled" scope="col">{{ __('list.type') }}</th>  <th x-show="tableColumns.liability_type.visible && tableColumns.liability_type.enabled" scope="col">                                         {{ __('list.liability_type') }}
                                     </th>
-                                    <th x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled">
-                                        {{ __('list.liability_direction') }}
+ <th x-show="tableColumns.liability_direction.visible && tableColumns.liability_direction.enabled" scope="col">                                         {{ __('list.liability_direction') }}
                                     </th>
-                                    <th x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled">
-                                        {{ __('list.interest') }}
+ <th x-show="tableColumns.liability_interest.visible && tableColumns.liability_interest.enabled" scope="col">                                         {{ __('list.interest') }}
                                     </th>
-                                    <th x-show="tableColumns.number.visible && tableColumns.number.enabled">
-                                        <a href="#" x-on:click.prevent="sort('account_number')">
+ <th x-show="tableColumns.number.visible && tableColumns.number.enabled" scope="col">                                         <a href="#" x-on:click.prevent="sort('account_number')">
                                             {{ __('list.account_number') }}
                                         </a>
                                         <em x-show="pageOptions.sortingColumn === 'account_number' && pageOptions.sortDirection === 'asc'"
@@ -133,8 +125,7 @@ class="fa-solid fa-arrow-down-a-z"></em>
                                         <em x-show="pageOptions.sortingColumn === 'account_number' && pageOptions.sortDirection === 'desc'"
                                             class="fa-solid fa-arrow-down-z-a"></em>
                                     </th>
-                                    <th x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled">
-                                        <a href="#" x-on:click.prevent="sort('balance')">
+ <th x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled" scope="col">                                         <a href="#" x-on:click.prevent="sort('balance')">
                                             {{ __('list.current_balance') }}
                                         </a>
                                         <em x-show="pageOptions.sortingColumn === 'balance' && pageOptions.sortDirection === 'asc'"
@@ -142,8 +133,7 @@ class="fa-solid fa-arrow-down-9-1"></em>
                                         <em x-show="pageOptions.sortingColumn === 'balance' && pageOptions.sortDirection === 'desc'"
                                             class="fa-solid fa-arrow-down-1-9"></em>
                                     </th>
-                                    <th x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">
-                                        <a href="#" x-on:click.prevent="sort('current_debt')">
+ <th x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled" scope="col">                                         <a href="#" x-on:click.prevent="sort('current_debt')">
                                             {{ __('list.amount_due') }}
                                         </a>
                                         <em x-show="pageOptions.sortingColumn === 'current_debt' && pageOptions.sortDirection === 'asc'"
@@ -151,8 +141,7 @@ class="fa-solid fa-arrow-down-wide-short"></em>
                                         <em x-show="pageOptions.sortingColumn === 'current_debt' && pageOptions.sortDirection === 'desc'"
                                             class="fa-solid fa-arrow-up-wide-short"></em>
                                     </th>
-                                    <th x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">
-                                        <a href="#" x-on:click.prevent="sort('last_activity')">
+ <th x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled" scope="col">                                         <a href="#" x-on:click.prevent="sort('last_activity')">
                                             {{ __('list.last_activity') }}
                                         </a>
                                         <em x-show="pageOptions.sortingColumn === 'last_activity' && pageOptions.sortDirection === 'asc'"
@@ -160,16 +149,14 @@ class="fa-solid fa-arrow-down-wide-short"></em>
                                         <em x-show="pageOptions.sortingColumn === 'last_activity' && pageOptions.sortDirection === 'desc'"
                                             class="fa-solid fa-arrow-up-wide-short"></em>
                                     </th>
-                                    <th x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled">
-                                        <a href="#" x-on:click.prevent="sort('balance_difference')">
+ <th x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled" scope="col">                                         <a href="#" x-on:click.prevent="sort('balance_difference')">
                                             {{ __('list.balance_difference') }}</a>
                                         <em x-show="pageOptions.sortingColumn === 'balance_difference' && pageOptions.sortDirection === 'asc'"
                                             class="fa-solid fa-arrow-down-wide-short"></em>
                                         <em x-show="pageOptions.sortingColumn === 'balance_difference' && pageOptions.sortDirection === 'desc'"
                                             class="fa-solid fa-arrow-up-wide-short"></em>
                                     </th>
-                                    <th x-show="tableColumns.menu.visible && tableColumns.menu.enabled">&nbsp;</th>
-                                </tr>
+ <th x-show="tableColumns.menu.visible && tableColumns.menu.enabled" scope="col">&nbsp;</th>                                 </tr>
                                 <tr x-show="pageOptions.isLoading">
                                     <td colspan="13" class="text-center">
                                         <span class="fa fa-spin fa-spinner"></span>
@@ -276,12 +263,6 @@ class="fa-solid fa-check"></em></button>
                                             </template>
                                         </td>
                                         <td x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">
-                                            <!--
-                                            <template x-if="null !== account.current_debt">
-                                                <span class="text-info"
-                                                    x-text="formatMoney(account.current_debt, account.currency_code)"></span>
-                                            </template>
-                                            -->
                                             FIXME
                                         </td>
                                         <td x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">
@@ -390,28 +371,6 @@ class="fa-solid fa-trash"></em> {{ __('firefly.delete') }}
                                     </div>
                                 </div>
                             </div>
-                            <!--
-                            <div class="row mb-3">
-                                <label for="inputEmail3" class="col-sm-4 col-form-label">Show info boxes</label>
-                                <div class="col-sm-8">
-                                    <div class="form-check form-switch form-check-inline">
-                                        <label>
-                                            <input class="form-check-input" type="checkbox"> <span>Box A</span>
-                                        </label>
-                                    </div>
-                                    <div class="form-check form-switch form-check-inline">
-                                        <label>
-                                            <input class="form-check-input" type="checkbox"> <span>Box B</span>
-                                        </label>
-                                    </div>
-                                    <div class="form-check form-switch form-check-inline">
-                                        <label>
-                                            <input class="form-check-input" type="checkbox"> <span>Box C</span>
-                                        </label>
-                                    </div>
-                                </div>
-                            </div>
-                            -->
                         </div>
                         <div class="modal-footer">
                             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>
diff --git a/resources/views/v2/layout/v2.blade.php b/resources/views/v2/layout/v2.blade.php
index 43796d2d1fc..e3174ba115f 100644
--- a/resources/views/v2/layout/v2.blade.php
+++ b/resources/views/v2/layout/v2.blade.php
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="{{ trans('config.html_language') }}">
-<!--  data-bs-theme="dark" -->
 <!--begin::Head-->
 @include('partials.layout.head')
 <!--end::Head-->
diff --git a/resources/views/v2/partials/form/transaction/tags.blade.php b/resources/views/v2/partials/form/transaction/tags.blade.php
index 4f2a55b3bc8..e0b57976fe1 100644
--- a/resources/views/v2/partials/form/transaction/tags.blade.php
+++ b/resources/views/v2/partials/form/transaction/tags.blade.php
@@ -14,10 +14,3 @@ class="form-select ac-tags"
 
     </div>
 </div>
-
-<!--
- :value="tag"
-<template x-for="(tag, index) in transaction.tags" :key="index">
-                <option value="bla">bla</option>
-            </template>
- -->
diff --git a/resources/views/v2/transactions/show.blade.php b/resources/views/v2/transactions/show.blade.php
index 80f948b3534..726ee6711b2 100644
--- a/resources/views/v2/transactions/show.blade.php
+++ b/resources/views/v2/transactions/show.blade.php
@@ -201,8 +201,7 @@ class="journal_description"
                                     </tr>
                                     <template x-if="null !== entry.category_name">
                                         <tr>
-                                            <th style="width:10%;">
-                                                <em title="{{ __('firefly.category') }}"
+ <th style="width:10%;" scope="col">                                                 <em title="{{ __('firefly.category') }}"
                                                     class="fa-solid fa-bookmark"></em>
                                             </th>
                                             <td><a :href="'./categories/show/' + entry.category_id"
@@ -211,8 +210,7 @@ class="fa-solid fa-bookmark"></em>
                                     </template>
                                     <template x-if="null !== entry.budget_name">
                                         <tr>
-                                            <th><em title="{{ __('firefly.budget') }}"
-                                                    class="fa-solid fa-chart-pie"></em></th>
+ <th scope="col"><em title="{{ __('firefly.budget') }}"                                                     class="fa-solid fa-chart-pie"></em></th>
                                             <td>
                                                 <a :href="'./budgets/show/' + entry.budget_id"
                                                    :title="entry.budget_name" x-text="entry.budget_name"></a></td>
@@ -230,27 +228,23 @@ class="fa-solid fa-calendar"></em></td>
                                     <template x-for="date in dateFields">
                                         <template x-if="null !== entry[date]">
                                             <tr>
-                                                <th><span x-text="date"></span></th>
-                                                <td><span x-text="entry[date]"></span></td>
+ <th scope="col"><span x-text="date"></span></th>                                                 <td><span x-text="entry[date]"></span></td>
                                             </tr>
                                         </template>
                                     </template>
                                     <template x-for="meta in metaFields">
                                         <template x-if="typeof entry[meta] !== 'undefined' && null !== entry[meta] && '' !== entry[meta]">
                                             <tr>
-                                                <th><span x-text="meta"></span></th>
-                                                <td><span x-text="entry[meta]"></span></td>
+ <th scope="col"><span x-text="meta"></span></th>                                                 <td><span x-text="entry[meta]"></span></td>
                                             </tr>
                                         </template>
                                     </template>
                                     <tr>
-                                        <th>recurring things</th>
-                                        <td>TODO recurring</td>
+ <th scope="col">recurring things</th>                                         <td>TODO recurring</td>
                                     </tr>
                                     <template x-if="entry.tags.length > 0">
                                         <tr>
-                                            <th><em title="{{ __('firefly.tags') }}" class="fa-solid fa-tag"></em></th>
-                                            <td>
+ <th scope="col"><em title="{{ __('firefly.tags') }}" class="fa-solid fa-tag"></em></th>                                             <td>
                                                 <template x-for="tag in entry.tags">
                                                     <a class="badge text-bg-info" :href="'./tags/show/' + tag"
                                                        :title="tag" x-text="tag"></a>
diff --git a/routes/api.php b/routes/api.php
index be21f9248c3..1985e490f88 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -334,7 +334,6 @@ static function (): void {
         Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
         Route::get('{userGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
         Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
-        // Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
         //        Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
         //        Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']);
         //        Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']);
@@ -389,9 +388,7 @@ static function (): void {
     ],
     static function (): void {
         Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
-        // Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
         Route::get('{availableBudget}', ['uses' => 'ShowController@show', 'as' => 'show']);
-        // Route::put('{availableBudget}', ['uses' => 'UpdateController@update', 'as' => 'update']);
         // Route::delete('{availableBudget}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']);
     }
 );
@@ -739,7 +736,6 @@ static function (): void {
     static function (): void {
         Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']);
         Route::post('', ['uses' => 'PreferencesController@store', 'as' => 'store']);
-        // Route::get('{preferenceList}', ['uses' => 'PreferencesController@showList', 'as' => 'show-list'])->where('preferenceList', ',+');
         Route::get('{preference}', ['uses' => 'PreferencesController@show', 'as' => 'show']);
         Route::put('{preference}', ['uses' => 'PreferencesController@update', 'as' => 'update']);
     }
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 0519d8eacdc..39dcfd957e9 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -1239,7 +1239,7 @@ static function (Generator $breadcrumbs, TransactionGroup $group, string $groupT
 Breadcrumbs::for(
     'transactions.mass.edit',
     static function (Generator $breadcrumbs, array $journals): void {
-        if (0 !== count($journals)) {
+        if (!empty($journals)) {
             $objectType = strtolower((string) reset($journals)['transaction_type_type']);
             $breadcrumbs->parent('transactions.index', $objectType);
             $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', ['']));
@@ -1263,7 +1263,7 @@ static function (Generator $breadcrumbs, array $journals): void {
 Breadcrumbs::for(
     'transactions.bulk.edit',
     static function (Generator $breadcrumbs, array $journals): void {
-        if (0 !== count($journals)) {
+        if (!empty($journals)) {
             $ids   = Arr::pluck($journals, 'transaction_journal_id');
             $first = reset($journals);
             $breadcrumbs->parent('transactions.index', strtolower((string) $first['transaction_type_type']));
@@ -1349,7 +1349,6 @@ static function (Generator $breadcrumbs): void {
     }
 );
 
-// Breadcrumbs::for(
 //    'administrations.show',
 //    static function (Generator $breadcrumbs, UserGroup $userGroup): void {
 //        $breadcrumbs->parent('administrations.index');
@@ -1357,7 +1356,6 @@ static function (Generator $breadcrumbs): void {
 //    }
 // );
 
-// Breadcrumbs::for(
 //    'administrations.create',
 //    static function (Generator $breadcrumbs): void {
 //        $breadcrumbs->parent('administrations.index');
diff --git a/routes/web.php b/routes/web.php
index cc59c95ca8a..f1a039a7aa9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -81,7 +81,6 @@ static function (): void {
 Route::group(
     ['middleware' => 'binders-only', 'namespace' => 'FireflyIII\Http\Controllers\System'],
     static function (): void {
-        // Route::get('offline', static fn () => view('errors.offline'));
         Route::get('health', ['uses' => 'HealthcheckController@check', 'as' => 'healthcheck']);
     }
 );
@@ -368,7 +367,6 @@ static function (): void {
     static function (): void {
         Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
         Route::get('{fromCurrencyCode}/{toCurrencyCode}', ['uses' => 'IndexController@rates', 'as' => 'rates']);
-        //        Route::get('create', ['uses' => 'CreateController@create', 'as' => 'create']);
         //        Route::get('edit/{currency}', ['uses' => 'EditController@edit', 'as' => 'edit']);
         //        Route::get('delete/{currency}', ['uses' => 'DeleteController@delete', 'as' => 'delete']);
         //        Route::post('store', ['uses' => 'CreateController@store', 'as' => 'store']);
@@ -1426,9 +1424,7 @@ static function (): void {
         Route::get('', ['uses' => 'UserGroup\IndexController@index', 'as' => 'index']);
         Route::get('create', ['uses' => 'UserGroup\CreateController@create', 'as' => 'create']);
         Route::get('edit/{userGroup}', ['uses' => 'UserGroup\EditController@edit', 'as' => 'edit']);
-        // Route::get('show/{userGroup}', ['uses' => 'UserGroup\ShowController@show', 'as' => 'show']);
 
-        //        Route::post('rescan/{bill}', ['uses' => 'Bill\ShowController@rescan', 'as' => 'rescan']);
         //        Route::get('delete/{bill}', ['uses' => 'Bill\DeleteController@delete', 'as' => 'delete']);
         //
         //        Route::post('store', ['uses' => 'Bill\CreateController@store', 'as' => 'store']);