Removed unneeded prefixes