Merge pull request #325 from TheBlueMatt/2019-03-322-cleanup