Clean up whitespace
Remove unused imports
Remove unused warning suppression
Merge branch 'clean_up'