Remove calls to deprecated get_sub_record()