Merge "Remove unused method" into rvc-dev