ENG-5708: some review changes and del debug code.