Cleanup unused imports
Tabs to spaces