Cleanups on templates Evernote doesn't have