Cleanups

23 jobs for master in 1 minute and 44 seconds (queued for 7 seconds)