Remove unused imports
Fix some things.