Merge "Cleanup API that is already @removed" into oc-dev