[#62380500] Removing duplicate work

This PR removes several duplications of the same work.
It does make it more procedural but this is an interim step on the way to tidying it up.