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