Tidy remove channel code