Cleanups

23 jobs for master in 8 minutes and 15 seconds (queued for 9 minutes and 49 seconds)