Merge branch 'cleanups' into 'master'

Cleanups to make shellcheck pass on root.sh

See merge request !101
1 job for master
in 16 seconds, using 0.0 compute credits, and was queued for 0 seconds