[FIX] cleanup new wallet functionality

- some stuff went missing during express merge resolution
- fixes