Cleanup, prefix => prefixes