Merge pull request #2971 from eileenmcnaughton/Cleanups