As we discussed, we also need a way to clean that up when the job is deleted by hand (and maybe you have that, haven't looked through everything).