More unused imports and variables.