Merge branch 'cleanup' into 'master'

Remove unused variables

See merge request !7
2 jobs for master in 32 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #46178
build

00:00:16

 
  Stable
passed #46179
manual
stable

00:00:16