ENYO-1336: code cleaning