Xcode changed things, and remove unnecessary comment