Shouldn't we remove the `Batchable` trait? It's unused, no?