remove some unnecessary uses of 'self'