Removed unused strings
Fixed Xcode5 warnings