ENYO-2615: remove use of self variable