Remove comments
Add account type key
REMOVE TOKEN FROM ACCOUNT CACHE