DDST-58: Removed unused batchSize and updates to batch termination