ENYO-3826: small clean up