Merge "Remove dead code" into rvc-dev