Removed the api swith