Merge branch 'cleanups'

4 jobs for master
in 18 minutes and 32 seconds and was queued for 1 second