remove unnecessary "self" references