I’ve thought a bit more about this one and I think it’s better to leave it for now, and just delete it when the passes are deleted. I’m not sure if there’s any downstream users of that hook but if there is, they may still need to switch between the DA and Legacy DA