Remove unnecessary uses of `self.`