* commit '3d27c9f973b1dd35ed457785b452851316cdca8a': Remove unused APIs and rename others based on API review