Merge "Remove unused private APIs"