Merge "Deprecate unused APIs"