Merge pull request #152 from TheBlueMatt/2018-09-chan-cleanups