final(?) xcode cleanup