economy wallet data saving redundant code removed