Minor change removing unused imports and variables.