Merge pull request #598 from TheBlueMatt/2020-04-559-cleanups