The site_collection column of HazardCalculation (a pickled SiteCollection object with the ids of the sites monkey patched) should die, I agree. But not now, it would affect all calculators, it is delicate and I would not like to address it in this pull request.