Optimize imports
Remove unused variable