Cleanup for iOS 7