removing unused imports and using supresslint