cleanup authManager

Incremental towards #882.