ENYO-2446: remove unnecessary code