Accounts with Token Authentication: cleanup