Merge pull request #405 from TheBlueMatt/2019-11-cleanups