Clean-up and unified initialization of DataChannels