Merge pull request #667 from valentinewallace/remove-channels-chanmon