Properly delete channels
Make channel param optional for channel remove