Channels controller cleanup

Thanks! I'll review that one.
(I see many conflicts when I rebase my code! hehe)