Cleanups on evernote removed code