Move stop jobs to cleanup stage