Removing unused code that breaks on Xcode 6