Batching clean-up

No match.