fixed unused imports and fields