Removed unused imports and variables