Merge "Remove @removed method" into oc-dev