can we remove references to host also ?
iirc we can infer the host from the executorId right ? This will remove all references to host when we can avoid it ...