Removing unnecessary prefixes