Remove unused imports and fields