Cleanup following OAuth2 merge