Clean up the prefixes