Merge "Remove useless code" into rvc-dev