Cleanup of some leftovers of earlier work that caused errors (now fixed)

Status Job ID Name Coverage
  Build
passed #46754
build

00:02:09