Further simplifications

3 jobs for master in 13 minutes and 15 seconds (queued for 5 seconds)