More changes to remove stragglers of old setuptools. Pip update needs to be done in both the stage1 and stage2 images. site-packages contain setuptools-65.5.0 in both stage1 and stage2. Because I copy stage1's site-packages to stage2, I need to remove the -65.5.0 directory in stage1 to prevent it from making the jump to stage 2. I do the pip update in stage2 before the copy, not after. So I don't have to worry about pip update messing with my locally installed files. But it does mean I have to pip update both stage1 and stage2. I could probably get away with just 1 pip update if I did it after the copy operation from stage1 into stage2 but... This way is probably safer.