removed all instances of self