Removing dependencies on oauth and oauth2