commit the code cleanup associated with #1516