Clean up Prefixes