PIM-1684: Clean job execution controller