This is a real shame. Every xcode update is a maximum pain. I always postpone that process till the end. Apple! Do something with it!