got rid of Wallet. tests green.