Further cleanup of setup scripts