Update imports

Remove unused imports
Reorder existing imports into alphabetical order
Add missing newline