Remove some unused imports
Remove unused imports and variables