removed self.delegate (part 2)