Remove 'self =' constructs