ENYO-2525: small cleanup