Remove duplicate code

2 jobs for master in 25 minutes and 25 seconds (queued for 153 minutes and 21 seconds)