Merge branch 'cleanup' into 'dev'

cleanup code

See merge request !24
1 job for 107-opengl-view in 1 minute and 10 seconds (queued for 3 seconds)