cleaning up and bugfixing

Status Job ID Name Coverage
  Build
passed #46938
build

00:01:41