Some cleanups on code dropped by Evernote

So no possibility of conflict when picking.
Remove superfluous blank line
Remove unused import
More cleanups on code dropped by Evernote

So no possibility of conflict when picking.
Docs: remove blank space before newline