Sync cleanup with authbucket/oauth2-bundle.