#273 batch size removed