remove unneeded self references