Wallet.h cleanup