Removal of tokens file dependency in authenicate.  It is now the responsibility of all clients to save and manage tokens.
Add missing ClientTokens member checks.