Remove the batch drawing for now