Use correct pointer
Add flag to not clear the job if it has active steps.