remove singleton interface from OAuth2AccountStore