More cleanup for DOI registration/sync