More function cleanup

1 job for master in 33 seconds (queued for 2 seconds)
latest