Xcode5 cleanup