ENG-5824 trivial cleanup