clean up channel binding code abit