Removed everything Collator-related