Merge branch 'kmohrf/cleanup' into 'master'

Update toolchain and cleanup code

See merge request !9
2 jobs for master in 9 minutes and 30 seconds (queued for 4 seconds)