removed duplicate work and simplified calls
removed version additions... that was a useless rabbit hole
removed header additions... that was a useless rabbit hole
clean up code and extend the run local test