For ENG-5865, remove unused imports and add parens to predicate to make clear when compression should be done