First cleanups for local to evernote sync