[FIX] cleanup new wallet functionality

- some stuff went missing during express merge resolution
- fixes
Merge pull request #135 from geertweening/fix/new-wallet

[FIX] cleanup new wallet functionality