Merge "Removing some deprecated methods" into rvc-dev