Cleaning out more unused code.
Update project work for Xcode 6.1.