Remove missed 'self' references