ENG-5569: Cleanup, delete pre-existing dead debugging code