Clean-up batch saving