Merge pull request #314 from TheBlueMatt/2019-03-chan-cleanup