Cleanups

20 jobs for master in 19 minutes and 39 seconds (queued for 35 minutes and 18 seconds)