removed self references