[Job] clean up the code

(#5623)