Removed api client changes