VE-646 code review adjustments, mostly cleanup and removing extraneous code