Merge branch 'cleanup' into 'master'

fix/cleanup leftovers from 92a7de46

See merge request !443
3 jobs for master in 8 minutes and 41 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #102997
linux-x64

00:08:41

passed #102998
linux-x86

00:08:40

passed #102999
x64 windows
windows-x64

00:07:46