Merge pull request #179 from TheBlueMatt/2018-09-pre-178-cleanups