cleanup authManager
Merge pull request #893 from Singly/cleaner-authManager

cleanup authManager
Merge branch 'master' into cleaner