Remove dependency on batch from online