Removed some unused imports and attributes