Add back vendor_strings and remove duplicates from cm_strings