cleanup following OAuth2 merge