Minor cleanup

13 jobs for master in 9 minutes and 50 seconds (queued for 7 seconds)