Removed the last reference to .calc_id