Some cleaning up in our batch scripts [ci skip].