Cleanups on Evernote dropped template