Remove unused imports and better syntax for other imports...