Merge pull request #594 from TheBlueMatt/2020-04-cleanups