Remove redundant references to 'self'