Clean Up

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

I'm working through a bunch of clean up here -- will update this MR as I go.

Edited by Blodgett, David L.

Merge request reports