Improvement to shot deletion

Now cascading on jobs too.