Beginning of cleanup for iOS.