Clean up batch methods using async