Merge "Remove duplicate code." into rvc-dev