Cleanups

26 jobs for master in 8 minutes and 58 seconds (queued for 9 seconds)