Clean up prefixes