More cleaning up of the scripts.