Merge branch 'cleanup' into 'master'

cleanup of code

See merge request !55
1 job for master in 1 second (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #2058
SSO
production

00:00:01