Cleanup #canonical_name