remove commented code
cache accounts on scan properly