Some cleanup of xcode support in preparation for new plugin