PIM-1439 : Fix error during channel update
PIM-1439 : Do some clean up