Merge pull request #2476 from wvanlint/remove_balance_msat