oauthlib related cleanups