Fix xcode Archive build errors by simplifying build process