Avant jour 2 (clean up)

2 jobs for master in 52 seconds (queued for 22 minutes and 59 seconds)