8be8030 Better cleanup for OAuth2ServiceProvider.