ENYO-2747: small clean up