Remove unneeded prefixes