Update channel and stream models and replace all resource use
Removes skip filters