Major cleanup of setup script.