Removed refs to EndpointFactory in model services