ENG-5901: refactor log and remove unwanted code.