Remove unnecessary tests and improve comments --- don't change below this line --- ENG-4331 Took 30 minutes