Cleanup Xcode 6 deprecation warnings warnings