Cleanups in batcher