ENYO-3616:  remove useless code