remove references to self
more removal of self