Clean up unused imports and a variable name.