iOS 8 + cleanup