Clean up prefixes order