MPH Cleanup May 4, 2019

The work is nearly finished.