a little bit of cleaning between channel and state
Merge branch 'master' of https://github.com/amd/rest3d