ENG-6428: refactor simplify.