ENYO-2784: remove unnecessary code