Remove basic collator (#12920)