Merge branch 'cleanup' into 'master'

Clean-up

See merge request !3
9 jobs for master in 8 minutes and 44 seconds (queued for 4 seconds)