[Bank] Cleanup + Bugfix