remove unnecessary self references