Remove explicit reference to self