Remove superfluous references to self