ENYO-2513: code cleaning