Merge pull request #597 from TheBlueMatt/2020-04-more-chanmon-cleanups