Unused imports
Remove dead code, fix some code style