diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 131b558f2d..2557b67407 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -341,11 +341,6 @@ class TransactionJournal extends TransactionJournalSupport
         $query->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transaction_journals.transaction_currency_id');
 
         // left join destination (for amount and account info).
-        $query->leftJoin(
-            'transactions', function (JoinClause $join) {
-            $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '>', 0);
-        }
-        );
         $query->groupBy('transaction_journals.id');
         $query->with(['categories', 'budgets', 'attachments', 'bill', 'transactions']);
     }
@@ -362,7 +357,7 @@ class TransactionJournal extends TransactionJournalSupport
             $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
         }
         $query->whereIn('transaction_types.type', $types);
-    }
+    }   
 
     /**
      *
diff --git a/app/Support/Models/TransactionJournalSupport.php b/app/Support/Models/TransactionJournalSupport.php
index e7aab0f43f..53e1c2c83d 100644
--- a/app/Support/Models/TransactionJournalSupport.php
+++ b/app/Support/Models/TransactionJournalSupport.php
@@ -12,7 +12,6 @@ namespace FireflyIII\Support\Models;
 
 
 use Carbon\Carbon;
-use DB;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
@@ -46,30 +45,8 @@ class TransactionJournalSupport extends Model
             return $cache->get();
         }
 
-        if ($journal->isWithdrawal() && !is_null($journal->source_amount)) {
-            $cache->store($journal->source_amount);
-
-            return $journal->source_amount;
-        }
-        if ($journal->isDeposit() && !is_null($journal->destination_amount)) {
-            $cache->store($journal->destination_amount);
-
-            return $journal->destination_amount;
-        }
-
         // saves on queries:
-        $amount = '0';
-        if (count($journal->transactions) === 0) {
-            $amount = '0';
-            foreach ($journal->transactions as $t) {
-                if ($t->amount > 0) {
-                    $amount = bcadd($amount, $t->amount);
-                }
-            }
-        }
-        if ($amount === '0') {
-            $amount = $journal->transactions()->where('amount', '>', 0)->get()->sum('amount');
-        }
+        $amount = $journal->transactions()->where('amount', '>', 0)->get()->sum('amount');
 
         if ($journal->isWithdrawal()) {
             $amount = $amount * -1;
@@ -275,8 +252,6 @@ class TransactionJournalSupport extends Model
             'transaction_journals.*',
             'transaction_types.type AS transaction_type_type', // the other field is called "transaction_type_id" so this is pretty consistent.
             'transaction_currencies.code AS transaction_currency_code',
-            DB::raw('SUM(`transactions`.`amount`) as `amount`'),
-            DB::raw('(COUNT(`transactions`.`id`) * 2) as `count_transactions`'),
         ];
     }