All "calls/routing" have finally been removed from domain objects.