More function cleanup

1 job for master in 33 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Default
passed #418
publish

00:00:33