clean up routing, return cb-wallet
Merge branch 'cbwallet'