Clean up extra code in evernote connect flow, Ticket0687