UC-29 Remove some debugging statements & address JS guideline issues