Cleanups

24 jobs for master in 10 minutes and 55 seconds (queued for 62 minutes and 23 seconds)