Cleanups

7 jobs for master in 4 minutes and 38 seconds (queued for 111 minutes and 57 seconds)