Some very small cleanups: Remove unused imports, break long lines...

Some very small cleanups: Remove unused imports, break long lines, add newline at end of file. Smallish things..