Fix bug that causes channels to be double cleaned up.