Correct extra clientFactory refernces