CAP-22 Add support for batchRemove