Cleanups

24 jobs for master in 8 minutes and 14 seconds (queued for 10 minutes and 16 seconds)