Merge pull request #249 from prattmic/cleanup