Clean up OAuth 2 support
5 files changed