more clean up

Blodgett, David L. requested to merge dblodgett/gfv2.0:main into main Oct 12, 2022