Removed unused imports and fields.