ENG-5540 Removed unnecessary collector variables