removed unused imports and fields