Remove static from HgClientFactory