core cleanup: move out batched_support flag