Remove more iOS 8 code