Cleanups

24 jobs for master in 9 minutes and 12 seconds (queued for 9 minutes and 21 seconds)