Additional iOS 7 cleanup.