removed wallet-related stuff