Clean up unused imports and variables