Some unused imports removed