Unused imports removed