Removed self. references.