Remove unused imports and one line of code