ENG-6375 Simplify logging