Merge "Remove unused strings." into rvc-dev