Clean up RAETChannel changes to support different usages

Removed usage from Channel. Only shows up in RAETChannel