Revert "Adding channel Cleanup"

This reverts commit 475ce85e9fa45afc8876aa510ea2acd20de629ab.