Tidy
Remove obsolete channels
Another tidy