Some clean up.
Avoid the creation of two channels.