Clean up new handling RAETCHannel as per feedback