Removed api prefixes