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