Further simplifications

1 job for master in 1 minute and 26 seconds (queued for 5 seconds)