Cleanups

24 jobs for master in 8 minutes and 17 seconds (queued for 32 minutes and 50 seconds)