cleaned up some more of setup.sh.