Merge "Cleanup: unneeded client definition, API override"