Cleaned up unused imports and variables.