#12 removed auto remove wallet entry