Removed unused and deprecated components.
Made ChannelFactory a Singleton.