Remove some unnecessary self references