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