Convert to ARC and modern Objective C