remove Wallet, add CoinQuery