Eliminated duplicate implementation

10 jobs for !9 with onestep in 23 minutes and 40 seconds (queued for 32 minutes and 5 seconds)
merge request