Quite right, thank you, this is legacy code that did not need to stay.
That will make the new code even simpler.