Fix card & bank account delete

Fixes #1202 and #1212