port private channels logic

@henrikhodne wdyt?

I'd try this on staging org/com and enterprise.
Once this is removed I think we can test this on staging.