Merge "Remove unused public APIs." into oc-dev