ENYO-3104: remove commented code
ENYO-3104: improve comments