Revert "Revert "nearly finished removing chan""

This reverts commit d5fb5bb54f35d3e93313049ed19c4e019d6d638d.