Cleanup

This clean up stuff done in PR gh-2212