Better cleanup for OAuth2ServiceProvider.