Use job.id
Revoke
Revert "Revoke"

This reverts commit aa2526aa41dc43a03f4fc302d618a0072f68b4c3.
Cleanup