Sync cleanup with authbucket/oauth2.