[Refactoring] Tidy up grouping of functional functions vs non-functional static ones. Not all of them has been sorted out, only those previously marked as functional #7042

Closed hboon closed 11 months ago