Merge "Remove unneeded methods" into oc-dev