Cleaned up OAuth2 services support