Merge pull request #298 from TheBlueMatt/2019-01-271-cleanup