Cleanup for Xcode 6 Beta

See title