Merge branch 'cleanup' into 'master'

Code cleanup

See merge request !68
3 jobs for master in 1 minute and 33 seconds (queued for 6 seconds)