Remove the ChannelFactory, bring back individual instantiation