ENYO-3375: simply code and remove debug code
ENYO-3375: simply code and remove debug code

mcanthony/ares-project,mcanthony/ares-project,enyojs/ares-project,enyojs/ares-project,mcanthony/ares-project,mcanthony/ares-project,mcanthony/ares-project,mcanthony/ares-project,enyojs/ares-project,enyojs/ares-project,enyojs/ares-project